diff options
author | Gerald Combs <gerald@wireshark.org> | 2022-03-21 15:13:57 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2022-03-25 16:51:55 +0000 |
commit | f8d3ebe0e2f3fa8fb28dd130ea9bb62c4250d53c (patch) | |
tree | deb6f8255aed2a831dcf2c35f2255ac22e89b315 /ui/qt/main_window_slots.cpp | |
parent | bdccea7692103095e5d5eb04a999d3413ef9e7c4 (diff) |
Qt: Handle qsizetype.
Qt 5.10 added qsizetype, aka an ssize_t and Qt 6 makes extensive use of
it. Add a compatibility typedef and use it where we can. Cast it away
where we can't.
Diffstat (limited to 'ui/qt/main_window_slots.cpp')
-rw-r--r-- | ui/qt/main_window_slots.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 42ad07f8de..8c211ab9ea 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1214,7 +1214,7 @@ void MainWindow::setEditCommentsMenu() } if (selectedRows().count() > 1) { main_ui_->menuPacketComment->addSeparator(); - main_ui_->menuPacketComment->addAction(tr("Delete comments from %n packet(s)", nullptr, selectedRows().count()), this, SLOT(actionDeleteCommentsFromPackets())); + main_ui_->menuPacketComment->addAction(tr("Delete comments from %n packet(s)", nullptr, static_cast<int>(selectedRows().count())), this, SLOT(actionDeleteCommentsFromPackets())); } } @@ -1306,8 +1306,8 @@ void MainWindow::setMenusForSelectedPacket() } } - main_ui_->actionEditMarkPacket->setText(tr("&Mark/Unmark Packet(s)", "", selectedRows().count())); - main_ui_->actionEditIgnorePacket->setText(tr("&Ignore/Unignore Packet(s)", "", selectedRows().count())); + main_ui_->actionEditMarkPacket->setText(tr("&Mark/Unmark Packet(s)", "", static_cast<int>(selectedRows().count()))); + main_ui_->actionEditIgnorePacket->setText(tr("&Ignore/Unignore Packet(s)", "", static_cast<int>(selectedRows().count()))); main_ui_->actionCopyListAsText->setEnabled(selectedRows().count() > 0); main_ui_->actionCopyListAsCSV->setEnabled(selectedRows().count() > 0); |