diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /ui/qt/packet_list.cpp | |
parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
download | wireshark-357cfd3b035d1ba6438e82cc1cbec105874206b6.tar.gz |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/packet_list.cpp')
-rw-r--r-- | ui/qt/packet_list.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 29cb6c677c..ca447b9fa7 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -674,7 +674,7 @@ int PacketList::sizeHintForColumn(int column) const // reimplementing QTreeView::sizeHintForColumn seems like a worse idea. if (itemDelegateForColumn(column)) { // In my (gcc) testing this results in correct behavior on Windows but adds extra space - // on OS X and Linux. We might want to add Q_OS_... #ifdefs accordingly. + // on macOS and Linux. We might want to add Q_OS_... #ifdefs accordingly. size_hint = itemDelegateForColumn(column)->sizeHint(viewOptions(), QModelIndex()).width(); } size_hint += QTreeView::sizeHintForColumn(column); // Decoration padding @@ -1441,7 +1441,7 @@ void PacketList::columnVisibilityTriggered() void PacketList::sectionResized(int col, int, int new_width) { if (isVisible() && !columns_changed_ && !set_column_visibility_ && new_width > 0) { - // Column 1 gets an invalid value (32 on OS X) when we're not yet + // Column 1 gets an invalid value (32 on macOS) when we're not yet // visible. // // Don't set column width when columns changed or setting column |