aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/protocol_hierarchy_dialog.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-05-28 11:40:08 -0700
committerAnders Broman <a.broman58@gmail.com>2020-05-30 06:45:07 +0000
commit76d92ba7e76ef0714090770ff1ee79861716388c (patch)
treee8c9bf03c20164eab7f890d0b63606e057f6f337 /ui/qt/protocol_hierarchy_dialog.cpp
parent3605bdc3232515d7e79c8ada86589ba518425870 (diff)
Qt: Updates for 5.15.
Fix the following deprecation issues for Qt 5.15: Use Qt::WindowFlags() instead of 0 in Qt >= 5.6. Pass Qt::SkipEmptyParts instead of QString::SkipEmptyParts to QString::split() in Qt >= 5.15. Use QMultiMap instead of QMap where we were using QMap::uniqeKeys(). Use QCP::Interactions() instead of 0. Use '\n' instead of QTextStream::endl. Use QWheelEvent::angleDelta() instead of QWheelEvent::angle(). Change-Id: Ie2d69d3a396c0821c2c34f506ddad6f8e22f7049 Reviewed-on: https://code.wireshark.org/review/37334 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/protocol_hierarchy_dialog.cpp')
-rw-r--r--ui/qt/protocol_hierarchy_dialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index ea7e306def..156970477c 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -337,7 +337,7 @@ void ProtocolHierarchyDialog::on_actionCopyAsCsv_triggered()
separated_value << v.toString();
}
}
- stream << separated_value.join(",") << endl;
+ stream << separated_value.join(",") << '\n';
if (!first) ++iter;
first = false;
@@ -352,13 +352,13 @@ void ProtocolHierarchyDialog::on_actionCopyAsYaml_triggered()
QTreeWidgetItemIterator iter(ui->hierStatsTreeWidget);
bool first = true;
- stream << "---" << endl;
+ stream << "---" << '\n';
while (*iter) {
QTreeWidgetItem *item = first ? NULL : (*iter);
- stream << "-" << endl;
+ stream << "-" << '\n';
foreach (QVariant v, protoHierRowData(item)) {
- stream << " - " << v.toString() << endl;
+ stream << " - " << v.toString() << '\n';
}
if (!first) ++iter;
first = false;