From 5254e66da33c188086789b8fb19c73ad013cf74a Mon Sep 17 00:00:00 2001 From: Igor Kushnir Date: Mon, 8 Mar 2021 17:54:20 +0200 Subject: [PATCH] Fix a typo in Viewer::magnifyingGlassShowed name Make Viewer::magnifyingGlassIsVisible() const. --- YACReader/viewer.cpp | 14 +++++++------- YACReader/viewer.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index 4a942df2..e7c23f90 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -36,7 +36,7 @@ Viewer::Viewer(QWidget *parent) drag(false), shouldOpenNext(false), shouldOpenPrevious(false), - magnifyingGlassShowed(false), + magnifyingGlassShown(false), restoreMagnifyingGlass(false) { translator = new YACReaderTranslator(this); @@ -715,7 +715,7 @@ void Viewer::mouseMoveEvent(QMouseEvent *event) showCursor(); hideCursorTimer->start(2500); - if (magnifyingGlassShowed) + if (magnifyingGlassShown) mglass->move(static_cast(event->x() - float(mglass->width()) / 2), static_cast(event->y() - float(mglass->height()) / 2)); if (render->hasLoadedComic()) { @@ -759,7 +759,7 @@ QPixmap Viewer::pixmap() const void Viewer::magnifyingGlassSwitch() { - magnifyingGlassShowed ? hideMagnifyingGlass() : showMagnifyingGlass(); + magnifyingGlassShown ? hideMagnifyingGlass() : showMagnifyingGlass(); } void Viewer::showMagnifyingGlass() @@ -770,14 +770,14 @@ void Viewer::showMagnifyingGlass() mglass->move(static_cast(p.x() - float(mglass->width()) / 2), static_cast(p.y() - float(mglass->height()) / 2)); mglass->show(); mglass->updateImage(mglass->x() + mglass->width() / 2, mglass->y() + mglass->height() / 2); - magnifyingGlassShowed = true; + magnifyingGlassShown = true; } } void Viewer::hideMagnifyingGlass() { mglass->hide(); - magnifyingGlassShowed = false; + magnifyingGlassShown = false; } void Viewer::informationSwitch() @@ -932,7 +932,7 @@ void Viewer::resetContent() void Viewer::setLoadingMessage() { - if (magnifyingGlassShowed) { + if (magnifyingGlassShown) { hideMagnifyingGlass(); restoreMagnifyingGlass = true; } @@ -942,7 +942,7 @@ void Viewer::setLoadingMessage() void Viewer::setPageUnavailableMessage() { - if (magnifyingGlassShowed) { + if (magnifyingGlassShown) { hideMagnifyingGlass(); restoreMagnifyingGlass = true; } diff --git a/YACReader/viewer.h b/YACReader/viewer.h index e86562d5..380ae11e 100644 --- a/YACReader/viewer.h +++ b/YACReader/viewer.h @@ -78,7 +78,7 @@ public slots: void animateHideGoToFlow(); void rotateLeft(); void rotateRight(); - bool magnifyingGlassIsVisible() { return magnifyingGlassShowed; } + bool magnifyingGlassIsVisible() const { return magnifyingGlassShown; } void setBookmark(bool); void save(); void doublePageSwitch(); @@ -157,7 +157,7 @@ private: private: //! Magnifying glass MagnifyingGlass *mglass; - bool magnifyingGlassShowed; + bool magnifyingGlassShown; bool restoreMagnifyingGlass; //! Manejadores de evento: