From f7713f70110948dddc0581d0209aed5124b6165c Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 5 Oct 2005 08:41:28 +0000 Subject: [PATCH] Squash compiler warnings. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10521 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 2 +- src/ChangeLog | 8 ++++++++ src/frontends/xforms/ChangeLog | 11 +++++++++++ src/frontends/xforms/FormGraphics.C | 12 ++++++------ src/frontends/xforms/FormParagraph.C | 23 ----------------------- src/frontends/xforms/FormTabular.C | 10 +++++----- src/frontends/xforms/FormVSpace.C | 7 ++----- src/text.C | 3 ++- 8 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 5df76a3ea3..9618481778 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -268,7 +268,7 @@ bool BufferView::Pimpl::loadLyXFile(string const & filename, bool tolastfiles) // Fall through to new load. (Asger) } - Buffer * b; + Buffer * b = 0; if (found) { b = bufferlist.newBuffer(s); diff --git a/src/ChangeLog b/src/ChangeLog index ca2f15d089..2dd8e7b854 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-10-05 Angus Leeming + + * BufferView_pimpl.C (loadLyXFile): ensure that a pointer is + always initialised before use. + + * text.C (setHeightOfRow): squash warning about comparison + of signed and unsigned types. + 2005-10-03 Martin Vermeer * text.C (cursorX): two fixes involving RtL text drawing diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index b7dd764eb7..5d7a7d6ded 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,14 @@ +2005-10-05 Angus Leeming + + * FormGraphics.C (build): + * FormVSpace.C (build): + squash warning about unused values in switch statement. + + * FormParagraph.C (build): remove unused switch statement. + + * FormTabular.C (update): replace "sprintf" with + "convert". + 2005-10-02 Martin Vermeer * FormToc.C: fix bug 2038 diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index 225aeadaa8..dee2baf95b 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -285,15 +285,15 @@ void FormGraphics::build() extra_->form); // set the right default unit + defaultUnit = "cm"; switch (lyxrc.default_papersize) { - case PAPER_DEFAULT: break; case PAPER_USLETTER: case PAPER_USLEGAL: - case PAPER_USEXECUTIVE: defaultUnit = "in"; break; - case PAPER_A3: - case PAPER_A4: - case PAPER_A5: - case PAPER_B5: defaultUnit = "cm"; break; + case PAPER_USEXECUTIVE: + defaultUnit = "in"; + break; + default: + break; } } diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index 6b5c8f0ea7..a5f36f8096 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -49,13 +49,6 @@ using support::rtrim; namespace frontend { -namespace { - -string defaultUnit("cm"); - -} // namespace anon - - typedef FormController > base_class; FormParagraph::FormParagraph(Dialog & parent) @@ -106,22 +99,6 @@ void FormParagraph::build() remove_if(units_vec.begin(), units_vec.end(), bind(contains, _1, '%')); units_vec.erase(del, units_vec.end()); - - // set default unit for custom length - switch (lyxrc.default_papersize) { - case PAPER_DEFAULT: - case PAPER_USLETTER: - case PAPER_USLEGAL: - case PAPER_USEXECUTIVE: - defaultUnit = "in"; - break; - case PAPER_A3: - case PAPER_A4: - case PAPER_A5: - case PAPER_B5: - defaultUnit = "cm"; - break; - } } diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index c307dcb9d3..d73e50010e 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -20,6 +20,7 @@ #include "controllers/ControlTabular.h" #include "controllers/helper_funcs.h" +#include "support/convert.h" #include "support/lstrings.h" #include "lyx_forms.h" @@ -152,7 +153,6 @@ void FormTabular::update() LyXTabular const & tabular = controller().tabular(); int align; - char buf[12]; LyXLength pwidth; string special; @@ -164,12 +164,12 @@ void FormTabular::update() fl_activate_object(cell_options_->input_special_multialign); fl_activate_object(column_options_->input_column_width); fl_activate_object(column_options_->choice_value_column_width); - sprintf(buf, "%d", column); - fl_set_input(dialog_->input_tabular_column, buf); + fl_set_input(dialog_->input_tabular_column, + convert(column).c_str()); fl_deactivate_object(dialog_->input_tabular_column); LyXTabular::row_type row = tabular.row_of_cell(cell); - sprintf(buf, "%d", row + 1); - fl_set_input(dialog_->input_tabular_row, buf); + fl_set_input(dialog_->input_tabular_row, + convert(row + 1).c_str()); fl_deactivate_object(dialog_->input_tabular_row); if (tabular.isMultiColumn(cell)) { fl_set_button(cell_options_->check_multicolumn, 1); diff --git a/src/frontends/xforms/FormVSpace.C b/src/frontends/xforms/FormVSpace.C index 86bb263251..dbec592c37 100644 --- a/src/frontends/xforms/FormVSpace.C +++ b/src/frontends/xforms/FormVSpace.C @@ -213,6 +213,7 @@ void FormVSpace::build() tooltips().init(dialog_->choice_space, str); // set default unit for custom length + defaultUnit = "cm"; switch (lyxrc.default_papersize) { case PAPER_DEFAULT: case PAPER_USLETTER: @@ -220,11 +221,7 @@ void FormVSpace::build() case PAPER_USEXECUTIVE: defaultUnit = "in"; break; - case PAPER_A3: - case PAPER_A4: - case PAPER_A5: - case PAPER_B5: - defaultUnit = "cm"; + default: break; } } diff --git a/src/text.C b/src/text.C index 6536f40233..425b72f7d0 100644 --- a/src/text.C +++ b/src/text.C @@ -1002,7 +1002,8 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) if (bv_owner->text() == this) { if (pit == 0 && row.pos() == 0) maxasc += 20; - if (pit + 1 == pars_.size() && row.endpos() == par.size()) + if (pit + 1 == pit_type(pars_.size()) && + row.endpos() == par.size()) maxdesc += 20; } -- 2.39.2