From b8485c0d8ab86cdeaf037477bcb2e09ece2cb3bd Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 13 Jul 2021 21:36:37 +0400 Subject: [PATCH] Fix -Wunused-variable warnings --- ui/effects/panel_animation.cpp | 3 --- ui/effects/radial_animation.cpp | 4 ---- ui/emoji_config.cpp | 2 ++ ui/gl/gl_detection.cpp | 6 ++++-- ui/image/image_prepare.cpp | 2 +- ui/layers/box_content.cpp | 1 - ui/platform/ui_platform_window.cpp | 1 - ui/style/style_core.cpp | 1 - ui/text/text.cpp | 1 - ui/text/text_block.cpp | 2 -- ui/text/text_entity.cpp | 4 +--- ui/toast/toast_widget.cpp | 1 - ui/widgets/checkbox.cpp | 1 - ui/widgets/inner_dropdown.cpp | 7 ------- ui/widgets/input_fields.cpp | 14 +++----------- ui/widgets/labels.cpp | 1 - 16 files changed, 11 insertions(+), 40 deletions(-) diff --git a/ui/effects/panel_animation.cpp b/ui/effects/panel_animation.cpp index 0ac70ef..9109599 100644 --- a/ui/effects/panel_animation.cpp +++ b/ui/effects/panel_animation.cpp @@ -416,7 +416,6 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, float if (fadeTop != fadeBottom) { auto painterFadeTop = fadeTop / pixelRatio; auto painterFrameWidth = frameWidth / pixelRatio; - auto painterFrameHeight = frameHeight / pixelRatio; p.drawPixmap(painterFrameLeft, painterFadeTop, painterFrameWidth, painterFadeBottom - painterFadeTop, _fadeMask, 0, fadeSkipLines, pixelRatio, fadeBottom - fadeTop); } if (fadeBottom != frameBottom) { @@ -424,8 +423,6 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, float } } } - auto frameInts = _frameInts + frameLeft + frameTop * _frameIntsPerLine; - auto frameIntsPerLineAdd = (_finalWidth - frameWidth) + _frameIntsPerLineAdded; // Draw corners paintCorner(_topLeft, frameLeft, frameTop); diff --git a/ui/effects/radial_animation.cpp b/ui/effects/radial_animation.cpp index 287f9b2..21e5a13 100644 --- a/ui/effects/radial_animation.cpp +++ b/ui/effects/radial_animation.cpp @@ -222,7 +222,6 @@ RadialState InfiniteRadialAnimation::computeState() { kFullArcLength }; } if (anim::Disabled()) { - const auto shown = 1.; return { 1., 0, kFullArcLength }; } const auto min = int(std::round(kFullArcLength * _st.arcMin)); @@ -245,9 +244,6 @@ RadialState InfiniteRadialAnimation::computeState() { const auto cycles = (now - _workStarted) / _st.sinePeriod; const auto relative = (now - _workStarted) % _st.sinePeriod; const auto smallDuration = _st.sineShift - _st.sineDuration; - const auto largeDuration = _st.sinePeriod - - _st.sineShift - - _st.sineDuration; const auto basic = int((linear + min + (cycles * (kFullArcLength + min - max))) % kFullArcLength); diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp index 3d75700..6680854 100644 --- a/ui/emoji_config.cpp +++ b/ui/emoji_config.cpp @@ -35,7 +35,9 @@ constexpr auto kSetVersion = uint32(2); constexpr auto kCacheVersion = uint32(6); constexpr auto kMaxId = uint32(1 << 8); +#if defined Q_OS_MAC && !defined OS_MAC_OLD constexpr auto kScaleForTouchBar = 150; +#endif enum class ConfigResult { Invalid, diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp index 5843839..195f2bc 100644 --- a/ui/gl/gl_detection.cpp +++ b/ui/gl/gl_detection.cpp @@ -16,14 +16,16 @@ #include #include -#define LOG_ONCE(x) static auto logged = [&] { LOG(x); return true; }(); +#define LOG_ONCE(x) [[maybe_unused]] static auto logged = [&] { LOG(x); return true; }(); namespace Ui::GL { namespace { bool ForceDisabled/* = false*/; +#ifdef Q_OS_WIN ANGLE ResolvedANGLE = ANGLE::Auto; +#endif // Q_OS_WIN void CrashCheckStart() { auto f = QFile(Integration::Instance().openglCheckFilePath()); @@ -102,7 +104,7 @@ Capabilities CheckCapabilities(QWidget *widget) { LOG_ONCE(("OpenGL Profile: Compatibility.")); } break; } - static const auto extensionsLogged = [&] { + [[maybe_unused]] static const auto extensionsLogged = [&] { const auto renderer = reinterpret_cast( functions->glGetString(GL_RENDERER)); LOG(("OpenGL Renderer: %1").arg(renderer ? renderer : "[nullptr]")); diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp index ea650d7..aaa4469 100644 --- a/ui/image/image_prepare.cpp +++ b/ui/image/image_prepare.cpp @@ -124,7 +124,7 @@ QImage prepareBlur(QImage img) { uchar *pix = img.bits(); if (pix) { - int w = img.width(), h = img.height(), wold = w, hold = h; + int w = img.width(), h = img.height(); const int radius = 3; const int r1 = radius + 1; const int div = radius * 2 + 1; diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp index cd6a406..d27c19e 100644 --- a/ui/layers/box_content.cpp +++ b/ui/layers/box_content.cpp @@ -175,7 +175,6 @@ void BoxContent::setInnerTopSkip(int innerTopSkip, bool scrollBottomFixed) { void BoxContent::setInnerBottomSkip(int innerBottomSkip) { if (_innerBottomSkip != innerBottomSkip) { - auto delta = innerBottomSkip - _innerBottomSkip; _innerBottomSkip = innerBottomSkip; if (_scroll && width() > 0) { updateScrollAreaGeometry(); diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp index 5eef4af..42949a3 100644 --- a/ui/platform/ui_platform_window.cpp +++ b/ui/platform/ui_platform_window.cpp @@ -115,7 +115,6 @@ void BasicWindowHelper::setupBodyTitleAreaEvents() { == Qt::LeftButton)) { _mousePressed = true; } else if (e->type() == QEvent::MouseMove) { - const auto mouseEvent = static_cast(e.get()); if (_mousePressed #ifndef Q_OS_WIN // We handle fullscreen startSystemMove() only on Windows. && !_window->isFullScreen() diff --git a/ui/style/style_core.cpp b/ui/style/style_core.cpp index 2a68082..9914e50 100644 --- a/ui/style/style_core.cpp +++ b/ui/style/style_core.cpp @@ -97,7 +97,6 @@ void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect auto pattern = anim::shifted(c); - auto resultBytesPerPixel = (src.depth() >> 3); constexpr auto resultIntsPerPixel = 1; auto resultIntsPerLine = (outResult->bytesPerLine() >> 2); auto resultIntsAdded = resultIntsPerLine - width * resultIntsPerPixel; diff --git a/ui/text/text.cpp b/ui/text/text.cpp index 2f07c5c..fa2d582 100644 --- a/ui/text/text.cpp +++ b/ui/text/text.cpp @@ -79,7 +79,6 @@ TextWithEntities PrepareRichFromRich( int32 i = 0, l = preparsed.size(); result.entities.clear(); result.entities.reserve(l); - const QChar s = result.text.size(); for (; i < l; ++i) { auto type = preparsed.at(i).type(); if (((type == EntityType::Mention || type == EntityType::MentionName) && !parseMentions) || diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp index b07c14b..bc34603 100644 --- a/ui/text/text_block.cpp +++ b/ui/text/text_block.cpp @@ -222,8 +222,6 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) { int item = -1; int newItem = eng->findItem(0); - style::align alignment = eng->option.alignment(); - const QCharAttributes *attributes = eng->attributes(); if (!attributes) return; diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp index b183ac8..467add2 100644 --- a/ui/text/text_entity.cpp +++ b/ui/text/text_entity.cpp @@ -1315,7 +1315,7 @@ QString EscapeForRichParsing(const QString &text) { QString SingleLine(const QString &text) { auto result = text; - auto s = text.unicode(), ch = s, e = text.unicode() + text.size(); + auto s = text.unicode(), e = text.unicode() + text.size(); // Trim. while (s < e && IsTrimmed(*s)) { @@ -1405,7 +1405,6 @@ QStringList PrepareSearchWords( ? *SplitterOverride : RegExpWordSplit(), base::QStringSkipEmptyParts); - auto size = list.size(); result.reserve(list.size()); for (const auto &word : std::as_const(list)) { auto trimmed = word.trimmed(); @@ -2196,7 +2195,6 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) { } return result; }; - auto till = offset; for (const auto &tag : tags) { if (tag.offset > offset) { processState(State()); diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp index 3f8f2a0..0081af7 100644 --- a/ui/toast/toast_widget.cpp +++ b/ui/toast/toast_widget.cpp @@ -165,7 +165,6 @@ void Widget::mouseMoveEvent(QMouseEvent *e) { } const auto point = e->pos() - QPoint(_st->padding.left(), _textTop); - const auto lines = _maxTextHeight / _st->style.font->height; const auto state = _text.getStateElided(point, _textWidth + 1); const auto was = ClickHandler::getActive(); if (was != state.link) { diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp index 29014e9..e75482b 100644 --- a/ui/widgets/checkbox.cpp +++ b/ui/widgets/checkbox.cpp @@ -564,7 +564,6 @@ void Checkbox::paintEvent(QPaintEvent *e) { Painter p(this); auto check = checkRect(); - auto ms = crl::now(); auto active = _check->currentAnimationValue(); if (isDisabled()) { p.setOpacity(_st.disabledOpacity); diff --git a/ui/widgets/inner_dropdown.cpp b/ui/widgets/inner_dropdown.cpp index 98f40f5..1edff2a 100644 --- a/ui/widgets/inner_dropdown.cpp +++ b/ui/widgets/inner_dropdown.cpp @@ -12,13 +12,6 @@ #include "ui/image/image_prepare.h" #include "ui/ui_utility.h" -namespace { - -constexpr float64 kFadeHeight = 1. / 3; -constexpr int kFadeAlphaMax = 160; - -} // namespace - namespace Ui { InnerDropdown::InnerDropdown( diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp index f15f7aa..2dd8674 100644 --- a/ui/widgets/input_fields.cpp +++ b/ui/widgets/input_fields.cpp @@ -108,7 +108,6 @@ bool IsNewline(QChar ch) { auto resultLink = QString(); const auto checkingLink = (tag == kTagCheckLinkMeta); const auto &text = textWithTags.text; - const auto &tags = textWithTags.tags; auto from = 0; auto till = int(text.size()); const auto adjust = [&] { @@ -1038,8 +1037,7 @@ void FlatInput::touchEvent(QTouchEvent *e) { if (!_touchPress) return; auto weak = MakeWeak(this); if (!_touchMove && window()) { - Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton); - QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart)); + QPoint mapped(mapFromGlobal(_touchStart)); if (_touchRightButton) { QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart); @@ -1077,7 +1075,6 @@ void FlatInput::finishAnimations() { void FlatInput::paintEvent(QPaintEvent *e) { Painter p(this); - auto ms = crl::now(); auto placeholderFocused = _placeholderFocusedAnimation.value(_focused ? 1. : 0.); auto pen = anim::pen(_st.borderColor, _st.borderActive, placeholderFocused); pen.setWidth(_st.borderWidth); @@ -1650,8 +1647,7 @@ void InputField::handleTouchEvent(QTouchEvent *e) { if (!_touchPress) return; auto weak = MakeWeak(this); if (!_touchMove && window()) { - Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton); - QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart)); + QPoint mapped(mapFromGlobal(_touchStart)); if (_touchRightButton) { QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart); @@ -2280,9 +2276,6 @@ void InputField::onDocumentContentsChange( ? _realCharsAdded : charsAdded; - const auto removePosition = position; - const auto removeLength = charsRemoved; - _correcting = true; QTextCursor(document->docHandle(), 0).joinPreviousEditBlock(); const auto guard = gsl::finally([&] { @@ -3855,8 +3848,7 @@ void MaskedInputField::touchEvent(QTouchEvent *e) { if (!_touchPress) return; auto weak = MakeWeak(this); if (!_touchMove && window()) { - Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton); - QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart)); + QPoint mapped(mapFromGlobal(_touchStart)); if (_touchRightButton) { QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart); diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp index d64d859..ec388b5 100644 --- a/ui/widgets/labels.cpp +++ b/ui/widgets/labels.cpp @@ -551,7 +551,6 @@ bool FlatLabel::eventHook(QEvent *e) { } void FlatLabel::touchEvent(QTouchEvent *e) { - const Qt::TouchPointStates &states(e->touchPointStates()); if (e->type() == QEvent::TouchCancel) { // cancel if (!_touchInProgress) return; _touchInProgress = false;