From 340fc6f08aa4282440df4038721a2153fc7ebb12 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Sat, 23 Dec 2017 21:31:41 +0100 Subject: Qt: rework ByteViewText::addFormatRange to avoid dead code (CID: 1426074). Change-Id: I8341a6106cd38118f0bf1bdb87aa87cc90e89eee Reviewed-on: https://code.wireshark.org/review/24966 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- ui/qt/widgets/byte_view_text.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ui/qt/widgets') diff --git a/ui/qt/widgets/byte_view_text.cpp b/ui/qt/widgets/byte_view_text.cpp index 4997936447..6a0e1b7046 100644 --- a/ui/qt/widgets/byte_view_text.cpp +++ b/ui/qt/widgets/byte_view_text.cpp @@ -432,9 +432,8 @@ void ByteViewText::drawLine(QPainter *painter, const int offset, const int row_y bool ByteViewText::addFormatRange(QList &fmt_list, int start, int length, HighlightMode mode) { - if (length < 1 || mode == ModeNormal) { + if (length < 1) return false; - } QTextLayout::FormatRange format_range; format_range.start = start; @@ -442,7 +441,7 @@ bool ByteViewText::addFormatRange(QList &fmt_list, int format_range.format.setProperty(QTextFormat::LineHeight, line_height_); switch (mode) { case ModeNormal: - break; + return false; case ModeField: format_range.format.setBackground(palette().highlight()); break; -- cgit v1.2.3