Amend 168d3557

I forgot to append an underscore for the private data member.

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c8afd2b5dfd08bac6476f43700e948040f6eee2b..317e0a1d383b9acae7e8f5504858c301110972e4 100644 (file)
--- 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<int>(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<int>(cmd.argument());
 
-                       if (zoom < static_cast<int>(zoom_min))
-                               zoom = zoom_min;
+                       if (zoom < static_cast<int>(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 c55d60bc089e4f0fe6510366b826a94dcaac8516..a84b7382256de07564b7cb1242f6223dbd497bbb 100644 (file)
--- 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;
 
 };