diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-05-16 08:41:58 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-17 04:24:28 +0000 |
| commit | 2fd5f93188e4f83c13cac07895bc5446a2138649 (patch) | |
| tree | 60ea0f75c807925dee677e5a7287d7b38fe22d2b /ui | |
| parent | 780087d996545b1a7e504a150dbd97e818a63afe (diff) | |
Qt: fix issue found by PVS Studio (V519)
The 'dp_ratio' variable is assigned values twice successively
Change-Id: Iac3bcefe61c3fe2f628f046ee6f77377fe7dd775
Reviewed-on: https://code.wireshark.org/review/27598
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/packet_list.cpp | 6 | ||||
| -rw-r--r-- | ui/qt/widgets/overlay_scroll_bar.cpp | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index e75cb8b7a5..bc0e674897 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -1636,8 +1636,7 @@ void PacketList::drawNearOverlay() if (!prefs.gui_packet_list_show_minimap) return; - qreal dp_ratio = 1.0; - dp_ratio = overlay_sb_->devicePixelRatio(); + qreal dp_ratio = overlay_sb_->devicePixelRatio(); int o_height = overlay_sb_->height() * dp_ratio; int o_rows = qMin(packet_list_model_->rowCount(), o_height); int o_width = (wsApp->fontMetrics().height() * 2 * dp_ratio) + 2; // 2ems + 1-pixel border on either side. @@ -1706,8 +1705,7 @@ void PacketList::drawFarOverlay() if (!prefs.gui_packet_list_show_minimap) return; QSize groove_size = overlay_sb_->grooveRect().size(); - qreal dp_ratio = 1.0; - dp_ratio = overlay_sb_->devicePixelRatio(); + qreal dp_ratio = overlay_sb_->devicePixelRatio(); groove_size *= dp_ratio; int o_width = groove_size.width(); int o_height = groove_size.height(); diff --git a/ui/qt/widgets/overlay_scroll_bar.cpp b/ui/qt/widgets/overlay_scroll_bar.cpp index 2c700d4f63..e6ff1b8b1d 100644 --- a/ui/qt/widgets/overlay_scroll_bar.cpp +++ b/ui/qt/widgets/overlay_scroll_bar.cpp @@ -105,8 +105,7 @@ void OverlayScrollBar::setNearOverlayImage(QImage &overlay_image, int packet_cou selected_pos_ = selected_pos; if (old_width != packet_map_img_.width()) { - qreal dp_ratio = 1.0; - dp_ratio = devicePixelRatio(); + qreal dp_ratio = devicePixelRatio(); packet_map_width_ = packet_map_img_.width() / dp_ratio; @@ -117,8 +116,7 @@ void OverlayScrollBar::setNearOverlayImage(QImage &overlay_image, int packet_cou void OverlayScrollBar::setMarkedPacketImage(QImage &mp_image) { - qreal dp_ratio = 1.0; - dp_ratio = devicePixelRatio(); + qreal dp_ratio = devicePixelRatio(); marked_packet_img_ = mp_image; marked_packet_width_ = mp_image.width() / dp_ratio; @@ -146,9 +144,8 @@ void OverlayScrollBar::resizeEvent(QResizeEvent *event) void OverlayScrollBar::paintEvent(QPaintEvent *event) { - qreal dp_ratio = 1.0; + qreal dp_ratio = devicePixelRatio(); QSize pm_size(packet_map_width_, geometry().height()); - dp_ratio = devicePixelRatio(); pm_size *= dp_ratio; QPainter painter(this); @@ -200,8 +197,7 @@ bool OverlayScrollBar::eventFilter(QObject *watched, QEvent *event) if (!marked_packet_img_.isNull()) { QRect groove_rect = grooveRect(); - qreal dp_ratio = 1.0; - dp_ratio = devicePixelRatio(); + qreal dp_ratio = devicePixelRatio(); groove_rect.setTopLeft(groove_rect.topLeft() * dp_ratio); groove_rect.setSize(groove_rect.size() * dp_ratio); |