From 5fd21db9d4ed2fab4c76f1c9c95ddfa068690208 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Sun, 9 Oct 2016 17:22:22 -0400 Subject: [PATCH] Amend 168d3557 I forgot to append an underscore for the private data member. --- src/frontends/qt4/GuiView.cpp | 8 ++++---- src/frontends/qt4/GuiView.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index c8afd2b5df..317e0a1d38 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -2034,9 +2034,9 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) bool const neg_zoom = convert(cmd.argument()) < 0 || (cmd.action() == LFUN_BUFFER_ZOOM_OUT && cmd.argument().empty()); - if (lyxrc.zoom <= zoom_min && neg_zoom) { + if (lyxrc.zoom <= zoom_min_ && neg_zoom) { docstring const msg = - bformat(_("Zoom level cannot be less than %1$d%."), zoom_min); + bformat(_("Zoom level cannot be less than %1$d%."), zoom_min_); flag.message(msg); enable = false; } else @@ -3981,8 +3981,8 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) } else zoom += convert(cmd.argument()); - if (zoom < static_cast(zoom_min)) - zoom = zoom_min; + if (zoom < static_cast(zoom_min_)) + zoom = zoom_min_; lyxrc.zoom = zoom; dr.setMessage(bformat(_("Zoom level is now %1$d%"), lyxrc.zoom)); diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index c55d60bc08..a84b738225 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -462,7 +462,7 @@ private: QLabel * version_control_; /// Minimum zoom percentage - unsigned int const zoom_min = 10; + unsigned int const zoom_min_ = 10; }; -- 2.39.2