hi, we let RenderBase.state_ uninitialized and then get conditional jumps based on unitialized value in our code. either we should set state_ to something, say 0, or force construtor to demand this like the quick shot below. what is the better way?
what do we use state_ for except mouse_hoover? pavel
diff --git a/src/insets/RenderBase.h b/src/insets/RenderBase.h index e42035d..ddb0721 100644 --- a/src/insets/RenderBase.h +++ b/src/insets/RenderBase.h @@ -52,7 +52,7 @@ public: virtual RenderMonitoredPreview * asMonitoredPreview() { return 0; } protected: - RenderBase() {} + RenderBase(int state) { state_ = state; } RenderBase(RenderBase const &) {} RenderBase & operator=(RenderBase const &) { return *this; } diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp index 9d080b8..6c00c47 100644 --- a/src/insets/RenderButton.cpp +++ b/src/insets/RenderButton.cpp @@ -22,7 +22,7 @@ namespace lyx { RenderButton::RenderButton() - : editable_(false) + : RenderBase(0), editable_(false) {} diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp index bca3a51..737c428 100644 --- a/src/insets/RenderGraphic.cpp +++ b/src/insets/RenderGraphic.cpp @@ -34,7 +34,7 @@ using namespace std; namespace lyx { -RenderGraphic::RenderGraphic(Inset const * inset) +RenderGraphic::RenderGraphic(Inset const * inset) : RenderBase(0) { loader_.connect(boost::bind(&Inset::updateFrontend, inset)); } diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp index c9086d5..846e534 100644 --- a/src/insets/RenderPreview.cpp +++ b/src/insets/RenderPreview.cpp @@ -46,7 +46,7 @@ LyXRC_PreviewStatus RenderPreview::status() RenderPreview::RenderPreview(Inset const * inset) - : parent_(inset) + : RenderBase(0), parent_(inset) {}