From 72c26ac6d14ddc05f92d5715855742d0d57616e7 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 13 Mar 2008 10:28:02 +0000 Subject: [PATCH] two uninitialized variables uncovered by valgrind, and a gcc warning git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23707 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Counters.h | 2 ++ src/frontends/qt4/GuiToolbar.cpp | 2 +- src/insets/InsetLayout.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Counters.h b/src/Counters.h index 96b14266c3..28e7b68632 100644 --- a/src/Counters.h +++ b/src/Counters.h @@ -73,6 +73,8 @@ private: /// Every instantiation is an array of counters of type Counter. class Counters { public: + /// + Counters() : appendix_(false), subfloat_(false) {} /// Add a new counter to array. void newCounter(docstring const & newc); /// Add new counter having oldc as its master and ls as its label. diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index ef37a77768..f5563faa00 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -301,7 +301,7 @@ public: /// void drawDisplay(QPainter * painter, QStyleOptionViewItem const & opt, - const QRect & rect, const QString & text ) const + const QRect & /*rect*/, const QString & text ) const { QString utext = underlineFilter(text); diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index 6cc9d27835..5e8391f864 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -29,6 +29,7 @@ namespace lyx { InsetLayout::InsetLayout() : name_(from_ascii("undefined")), labelstring_(from_ascii("UNDEFINED")), + decoration_(InsetLayout::Classic), font_(sane_font), labelfont_(sane_font), bgcolor_(Color_error), multipar_(false), passthru_(false), needprotect_(false), freespacing_(false), keepempty_(false), forceltr_(false) -- 2.39.5