Wireshark-commits: [Wireshark-commits] master-3.0 8fd4d82: Qt: fix more more Qt 5.13 deprecation wa
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8fd4d8269222f02400ef0be4a71cd177f4c7bdb5
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark
Commits:
8fd4d82 by Peter Wu (peter@xxxxxxxxxxxxx):
Qt: fix more more Qt 5.13 deprecation warnings
Potential functional changes:
- rect_on_screen: the new function no longer subtracts the space needed
for the dock, task bar, etc.
- fontMetrics().width(text) -> fontMetrics.boundingRect(text).width():
the bounding box width could be larger than horizontalAdvance(text).
For the bytes view, they should be the same due to monospace font.
The display filter field calculation was made more accurate (it
assumes that textMargins() is 0 which is the default).
Change-Id: I70b7937f9215d3bef278befdac7c36a023ffff84
Reviewed-on: https://code.wireshark.org/review/33770
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit a854811c4aa40d717c17499ead06cfec5f077fa5)
Reviewed-on: https://code.wireshark.org/review/34236
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 462f640 Replace Qsort with std::sort
add 8fd4d82 Qt: fix more more Qt 5.13 deprecation warnings
Summary of changes:
ui/qt/models/pref_models.cpp | 2 +-
ui/qt/utils/qt_ui_utils.cpp | 8 ++++----
ui/qt/widgets/byte_view_text.cpp | 26 +++++++++++++++++---------
ui/qt/widgets/capture_filter_combo.cpp | 2 +-
ui/qt/widgets/display_filter_combo.cpp | 2 +-
ui/qt/widgets/syntax_line_edit.cpp | 7 ++++++-
6 files changed, 30 insertions(+), 17 deletions(-)