diff options
Diffstat (limited to 'ui')
31 files changed, 55 insertions, 55 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index d200c31696..acd4d40d6b 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -354,7 +354,7 @@ void commandline_other_options(int argc, char *argv[], gboolean opt_reset) /* * To reset the options parser, set optreset to 1 on platforms that - * have optreset (documented in *BSD and OS X, apparently present but + * have optreset (documented in *BSD and macOS, apparently present but * not documented in Solaris - the Illumos repository seems to * suggest that the first Solaris getopt_long(), at least as of 2004, * was based on the NetBSD one, it had optreset) and set optind to 1, diff --git a/ui/console.c b/ui/console.c index 2f3064b290..a2d156909e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -111,7 +111,7 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level, } else { /* XXX - on UN*X, should we just use g_log_default_handler()? We want the error messages to go to the standard output; - on Mac OS X, that will cause them to show up in various + on macOS, that will cause them to show up in various per-user logs accessible through Console (details depend on whether you're running 10.0 through 10.4 or running 10.5 and later), and, on other UN*X desktop environments, diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c index 72acf6029b..47e8938302 100644 --- a/ui/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -292,7 +292,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) ioctls (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS in newer kernels, EXT2_IOC_GETFLAGS/EXT2_IOC_SETFLAGS in older kernels - non-ext2 file systems that support those ioctls use the same values as ext2 - does), appears to be more like the *BSD/OS X "system immutable" + does), appears to be more like the *BSD/macOS "system immutable" flag, as it can be set only by the superuser or by processes with CAP_LINUX_IMMUTABLE, so it sounds as if it's not intended for arbitrary users to set or clear. */ @@ -314,8 +314,8 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, #ifdef __APPLE__ - /* Stuff in the OS X UI calls files with the "user immutable" bit - "locked"; pre-OS X Mac software might have had that notion and + /* Stuff in the macOS UI calls files with the "user immutable" bit + "locked"; the classic Mac OS might have had that notion and called it "locked". */ "The file \"%s\" is locked.", #else /* __APPLE__ */ diff --git a/ui/gtk/main.c b/ui/gtk/main.c index c8b030b2fc..b7002f5660 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -3195,7 +3195,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p menubar = main_menu_new(&accel); #if defined(HAVE_IGE_MAC_INTEGRATION) || defined (HAVE_GTKOSXAPPLICATION) - /* Mac OS X native menus are created and displayed by main_menu_new() */ + /* macOS native menus are created and displayed by main_menu_new() */ if(!prefs_p->gui_macosx_style) { #endif gtk_window_add_accel_group(GTK_WINDOW(top_level), accel); diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index a9b981b3ca..8669743135 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -2501,7 +2501,7 @@ main_menu_new(GtkAccelGroup ** table) } /* The quit item in the application menu shows up whenever ige mac - * integration is enabled, even if the OS X UI style in Wireshark isn't + * integration is enabled, even if the macOS UI style in Wireshark isn't * turned on. */ quit_item = gtk_menu_item_new_with_label("Quit"); g_signal_connect(quit_item, "activate", G_CALLBACK(file_quit_cmd_cb), NULL); diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 4438444835..176f55dbfd 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -205,8 +205,8 @@ gui_prefs_show(void) #if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION) macosx_style_cb = create_preference_check_button(main_grid, pos++, - "OS X style", - "Create an OS X look and feel. Checking this box will move the " + "macOS style", + "Create a macOS look and feel. Checking this box will move the " "menu bar to the top of the screen instead of the top of the Wireshark window. " "Requires a restart of Wireshark to take effect.", prefs.gui_macosx_style); diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index 7bc23c7f04..ec729937bf 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -323,7 +323,7 @@ static int rint(double ); /* compiler template for Windows */ static struct irect zoomrect; -/* XXX - what about OS X? */ +/* XXX - what about macOS? */ static char helptext[] = "Here's what you can do:\n" "\n" diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 0a68b6353f..266e0968ed 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -480,7 +480,7 @@ static struct irect zoomrect; /* #define ORIGINAL_WIN32_BUTTONS 1 */ -/* XXX - what about OS X? */ +/* XXX - what about macOS? */ /* XXX: Needs work to ensire that the columns line up properly in both Gtk2 & Gtk3 */ /* What is the proper way to do this ?? */ static char helptext[] = diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index 36e94debf5..467a7333f1 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -72,12 +72,12 @@ * (Its Windows openURL uses ShellExecute() on non-mailto URLs (it * does more exotic stuff for mailto: URLs). * - * Its OS X stuff uses the openURL method of an NSWorkspace (which + * Its macOS stuff uses the openURL method of an NSWorkspace (which * probably ends up in Launch Services....).) * * GTK+ has gtk_show_uri(), but that ultimately uses gvfs on UN*X, * so it's not appropriate for non-GNOME UN*Xes (including, but not - * limited to, OS X), and ultimately appears to be a stubbed-out + * limited to, macOS), and ultimately appears to be a stubbed-out * routine in GLib 2.36.0, so it's not very useful for a cross- * platform applicatio n. * @@ -125,7 +125,7 @@ /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */ #include <shellapi.h> #elif defined (HAVE_OS_X_FRAMEWORKS) -/* Mac OS X - use Launch Services to start a browser */ +/* macOS - use Launch Services to start a browser */ #include <CoreFoundation/CoreFoundation.h> #include <ApplicationServices/ApplicationServices.h> #else diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 9dd95c47a3..d213ed0e2b 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -58,7 +58,7 @@ class CaptureFileDialog : public QFileDialog // // On Windows Vista and later we should probably use IFileOpenDialog. On earlier // versions of Windows (including XP) we should use GetOpenFileName, which is - // what we do in ui/win32/file_dlg_win32.c. On OS X we should use NSOpenPanel. On + // what we do in ui/win32/file_dlg_win32.c. macOS we should use NSOpenPanel. On // other platforms we should fall back to QFileDialog. // // Yes, that's four implementations of the same window. diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp index 29cf4c1452..9f6ae0cc1c 100644 --- a/ui/qt/capture_filter_syntax_worker.cpp +++ b/ui/qt/capture_filter_syntax_worker.cpp @@ -36,7 +36,7 @@ // We use a global mutex to protect pcap_compile since it calls gethostbyname. // This probably isn't needed on Windows (where pcap_comple calls -// EnterCriticalSection + LeaveCriticalSection) or *BSD or OS X where +// EnterCriticalSection + LeaveCriticalSection) or *BSD or macOS where // gethostbyname(3) claims that it's thread safe. static QMutex pcap_compile_mtx_; diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp index a7af4bd9c7..9e15950f1b 100644 --- a/ui/qt/export_object_dialog.cpp +++ b/ui/qt/export_object_dialog.cpp @@ -334,7 +334,7 @@ void ExportObjectDialog::saveAllEntries() // // XXX - what we *really* want is something that asks the user // for an existing directory *but* lets them create a new - // directory in the process. That's what we get on OS X, + // directory in the process. That's what we get on macOS, // as the native dialog is used, and it supports that; does // that also work on Windows and with Qt's own dialog? // diff --git a/ui/qt/geometry_state_dialog.h b/ui/qt/geometry_state_dialog.h index 28ef1c5450..868a8116a4 100644 --- a/ui/qt/geometry_state_dialog.h +++ b/ui/qt/geometry_state_dialog.h @@ -33,7 +33,7 @@ public: // As discussed in change 7072, QDialogs have different minimize and "on // top" behaviors depending on their parents, flags, and platforms. // -// W = Windows, L = Linux, X = OS X +// W = Windows, L = Linux (and other non-macOS UN*Xes), X = macOS // // QDialog(parent) // @@ -57,9 +57,9 @@ public: // W, L, X: Independent, minimize button. // // Additionally, maximized, parent-less dialogs can close to a black screen -// on OS X: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12544 +// on macOS: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12544 // -// Pass in the parent on OS X and NULL elsewhere so that we have an +// Pass in the parent on macOS and NULL elsewhere so that we have an // independent window that un-maximizes correctly. #ifdef Q_OS_MAC explicit GeometryStateDialog(QWidget *parent, Qt::WindowFlags f = 0) : QDialog(parent, f) {} diff --git a/ui/qt/interface_tree_model.cpp b/ui/qt/interface_tree_model.cpp index 54bca41677..76dafe40a4 100644 --- a/ui/qt/interface_tree_model.cpp +++ b/ui/qt/interface_tree_model.cpp @@ -421,7 +421,7 @@ void InterfaceTreeModel::updateStatistic(unsigned int idx) if ( !stat_cache_ ) { // Start gathering statistics using dumpcap - // We crash (on OS X at least) if we try to do this from ::showEvent. + // We crash (on macOS at least) if we try to do this from ::showEvent. stat_cache_ = capture_stat_start(&global_capture_opts); } if ( !stat_cache_ ) diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index f779173323..cab6dda92c 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -433,7 +433,7 @@ void IOGraphDialog::syncGraphSettings(QTreeWidgetItem *item) hint_err_ = iog->configError(); visible = false; retap = false; - // On OS X the "not user checkable" checkbox isn't obviously disabled. + // On macOS the "not user checkable" checkbox isn't obviously disabled. // For now show it as partially checked. item->setCheckState(name_col_, Qt::PartiallyChecked); item->setFlags(item->flags() & ~Qt::ItemIsUserCheckable); diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 8832b519dc..3618f02f64 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -193,7 +193,7 @@ MainWelcome::MainWelcome(QWidget *parent) : updateRecentCaptures(); #if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0) - // This crashes with Qt 4.8.3 on OS X. + // This crashes with Qt 4.8.3 on macOS. QGraphicsBlurEffect *blur = new QGraphicsBlurEffect(welcome_ui_->childContainer); blur->setBlurRadius(2); welcome_ui_->childContainer->setGraphicsEffect(blur); diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h index f862154ba6..231ef70ed1 100644 --- a/ui/qt/main_welcome.h +++ b/ui/qt/main_welcome.h @@ -64,7 +64,7 @@ private: QString show_in_str_; SplashOverlay *splash_overlay_; - // QListWidget doesn't activate items when the return or enter keys are pressed on OS X. + // QListWidget doesn't activate items when the return or enter keys are pressed on macOS. // We may want to subclass it at some point. QListWidget *recent_files_; // MWOverlay *overlay; diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 567a8e8ff1..35605057b4 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1022,7 +1022,7 @@ void MainWindow::saveWindowGeometry() } if (prefs.gui_geometry_save_maximized) { - // On OS X this is false when it shouldn't be + // On macOS this is false when it shouldn't be recent.gui_geometry_main_maximized = isMaximized(); } @@ -1808,7 +1808,7 @@ void MainWindow::initMainToolbarIcons() int icon_size = style()->pixelMetric(QStyle::PM_SmallIconSize); #if !defined(Q_OS_WIN) // Force icons to 24x24 for now, otherwise actionFileOpen looks wonky. - // The OS X HIG specifies 32-pixel icons but they're a little too + // The macOS HIG specifies 32-pixel icons but they're a little too // large IMHO. icon_size = icon_size * 3 / 2; #endif @@ -2063,7 +2063,7 @@ void MainWindow::setTitlebarForCaptureFile() } else { // // For a user file, set the full path; that way, - // for OS X, it'll set the "proxy icon". Qt + // for macOS, it'll set the "proxy icon". Qt // handles extracting the last component. // // Sadly, some UN*Xes don't necessarily use UTF-8 @@ -2115,7 +2115,7 @@ void MainWindow::setWSWindowTitle(QString title) if (prefs.gui_window_title && prefs.gui_window_title[0]) { QString custom_title = replaceWindowTitleVariables(prefs.gui_window_title); #ifdef __APPLE__ - // On OS X we separate the titles with a unicode em dash + // On macOS we separate the titles with a unicode em dash title.append(QString(" %1 %2").arg(UTF8_EM_DASH).arg(custom_title)); #else title.append(QString(" [%1]").arg(custom_title)); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 555394eb16..4eef2ec9ca 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1070,7 +1070,7 @@ void MainWindow::stopCapture() { } // Keep focus rects from showing through the welcome screen. Primarily for -// OS X. +// macOS. void MainWindow::mainStackChanged(int) { for (int i = 0; i < main_ui_->mainStack->count(); i++) { @@ -1673,7 +1673,7 @@ void MainWindow::on_actionNewDisplayFilterExpression_triggered() showAccordionFrame(main_ui_->filterExpressionFrame); } -// On Qt4 + OS X with unifiedTitleAndToolBarOnMac set it's possible to make +// On Qt4 + macOS with unifiedTitleAndToolBarOnMac set it's possible to make // the main window obnoxiously wide. void MainWindow::displayFilterButtonClicked() @@ -2201,7 +2201,7 @@ void MainWindow::showPreferencesDialog(PreferencesDialog::PreferencesPane start_ pref_dialog.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } @@ -2215,7 +2215,7 @@ void MainWindow::showPreferencesDialog(QString module_name) pref_dialog.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } @@ -2696,7 +2696,7 @@ void MainWindow::on_actionAnalyzeDisplayFilterMacros_triggered() uat_dlg.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } @@ -2811,7 +2811,7 @@ void MainWindow::on_actionAnalyzeEnabledProtocols_triggered() enable_proto_dialog.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } @@ -2829,7 +2829,7 @@ void MainWindow::on_actionAnalyzeDecodeAs_triggered() da_dialog.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index fc6eadd1ea..23986a974e 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -445,7 +445,7 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r } // We don't actually store these. When we do we should make sure they're stored -// securely using CryptProtectData, the OS X Keychain, GNOME Keyring, KWallet, etc. +// securely using CryptProtectData, the macOS Keychain, GNOME Keyring, KWallet, etc. void ManageInterfacesDialog::remoteAccepted() { QTreeWidgetItemIterator it(ui->remoteList); diff --git a/ui/qt/overlay_scroll_bar.cpp b/ui/qt/overlay_scroll_bar.cpp index 64bd504af4..b8b277d1ef 100644 --- a/ui/qt/overlay_scroll_bar.cpp +++ b/ui/qt/overlay_scroll_bar.cpp @@ -47,7 +47,7 @@ class OsbProxyStyle : public QProxyStyle { public: - // Disable transient behavior. Mainly for OS X but possibly applies to + // Disable transient behavior. Mainly for macOS but possibly applies to // other platforms. If we want to enable transience we'll have to // handle the following at a minimum: // 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 diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp index fb209ad4c2..52132bd952 100644 --- a/ui/qt/profile_dialog.cpp +++ b/ui/qt/profile_dialog.cpp @@ -59,7 +59,7 @@ ProfileDialog::ProfileDialog(QWidget *parent) : ok_button_ = pd_ui_->buttonBox->button(QDialogButtonBox::Ok); // XXX - Use NSImageNameAddTemplate and NSImageNameRemoveTemplate to set stock - // icons on OS X. + // icons on macOS. // Are there equivalent stock icons on Windows? #ifdef Q_OS_MAC pd_ui_->newToolButton->setAttribute(Qt::WA_MacSmallSize, true); diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp index 07da92492b..e24c205f72 100644 --- a/ui/qt/progress_frame.cpp +++ b/ui/qt/progress_frame.cpp @@ -35,7 +35,7 @@ #include "wireshark_application.h" // To do: -// - Add an NSProgressIndicator to the dock icon on OS X. +// - Add an NSProgressIndicator to the dock icon on macOS. // - Start adding the progress bar to dialogs. // - Don't complain so loudly when the user stops a capture. diff --git a/ui/qt/protocol_preferences_menu.cpp b/ui/qt/protocol_preferences_menu.cpp index 4e3c6e207f..935430d846 100644 --- a/ui/qt/protocol_preferences_menu.cpp +++ b/ui/qt/protocol_preferences_menu.cpp @@ -98,7 +98,7 @@ public: UatDialog uat_dlg(parentWidget(), prefs_get_uat_value(pref_)); uat_dlg.exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); } diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index cdd9177ac7..fde66c8127 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -621,7 +621,7 @@ void RtpAudioStream::outputStateChanged(QAudio::State new_state) { if (!audio_output_) return; - // On some platforms including OS X and Windows, the stateChanged signal + // On some platforms including macOS and Windows, the stateChanged signal // is emitted while a QMutexLocker is active. As a result we shouldn't // delete audio_output_ here. switch (new_state) { diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp index 566ce7b6ee..ed76bfe13b 100644 --- a/ui/qt/sctp_chunk_statistics_dialog.cpp +++ b/ui/qt/sctp_chunk_statistics_dialog.cpp @@ -296,7 +296,7 @@ void SCTPChunkStatisticsDialog::on_actionChunkTypePreferences_triggered() UatDialog *uatdialog = new UatDialog(this, uat); uatdialog->exec(); // Emitting PacketDissectionChanged directly from a QDialog can cause - // problems on OS X. + // problems on macOS. wsApp->flushAppSignals(); ui->tableWidget->clear(); diff --git a/ui/qt/stock_icon.cpp b/ui/qt/stock_icon.cpp index cc1da56564..44f94d46c0 100644 --- a/ui/qt/stock_icon.cpp +++ b/ui/qt/stock_icon.cpp @@ -24,7 +24,7 @@ // Stock icons. Based on gtk/stock_icons.h // Toolbar icon sizes: -// OS X freestanding: 32x32, 32x32@2x, segmented (inside a button): <= 19x19 +// macOS freestanding: 32x32, 32x32@2x, segmented (inside a button): <= 19x19 // Windows: 16x16, 24x24, 32x32 // GNOME: 24x24 (default), 48x48 diff --git a/ui/qt/stock_icon_tool_button.cpp b/ui/qt/stock_icon_tool_button.cpp index d29d818b26..71b365aa4a 100644 --- a/ui/qt/stock_icon_tool_button.cpp +++ b/ui/qt/stock_icon_tool_button.cpp @@ -31,7 +31,7 @@ // We want nice icons that render correctly, and that are responsive // when the user hovers and clicks them. // Using setIcon renders correctly on normal and retina displays. It is -// not completely responsive, particularly on OS X. +// not completely responsive, particularly on macOS. // Calling setStyleSheet is responsive, but does not render correctly on // retina displays: https://bugreports.qt.io/browse/QTBUG-36825 // Subclass QToolButton, which lets us catch events and set icons as needed. @@ -88,7 +88,7 @@ bool StockIconToolButton::event(QEvent *event) case QEvent::Timer: { // We can lose QEvent::Leave, QEvent::HoverLeave and underMouse() - // on OS X if a tooltip appears: + // on macOS if a tooltip appears: // https://bugreports.qt.io/browse/QTBUG-46379 // Work around the issue by periodically checking the mouse // position and scheduling a fake leave event when the mouse diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index e301cc2bf9..0f25eee0a2 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -729,13 +729,13 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // // QFileSystemWatcher should allow us to watch for files being // removed or renamed. It uses kqueues and EVFILT_VNODE on FreeBSD, - // NetBSD, FSEvents on OS X, inotify on Linux if available, and + // NetBSD, FSEvents on macOS, inotify on Linux if available, and // FindFirstChagneNotification() on Windows. On all other platforms, // it just periodically polls, as we're doing now. // // For unmounts: // - // OS X and FreeBSD deliver NOTE_REVOKE notes for EVFILT_VNODE, and + // macOS and FreeBSD deliver NOTE_REVOKE notes for EVFILT_VNODE, and // QFileSystemWatcher delivers signals for them, just as it does for // NOTE_DELETE and NOTE_RENAME. // @@ -762,7 +762,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // // Note also that remote file systems might not report file // removal or renames if they're done on the server or done by - // another client. At least on OS X, they *will* get reported + // another client. At least on macOS, they *will* get reported // if they're done on the machine running the program doing the // kqueue stuff, and, at least in newer versions, should get // reported on SMB-mounted (and AFP-mounted?) file systems @@ -778,7 +778,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // catch *that* would be to watch for mounts and re-check all // marked-as-inaccessible files. // - // OS X and FreeBSD also support EVFILT_FS events, which notify you + // macOS and FreeBSD also support EVFILT_FS events, which notify you // of file system mounts and unmounts. We'd need to add our own // kqueue for that, if we can check those with QSocketNotifier. // @@ -800,7 +800,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // (Speaking of automounters, repeatedly polling recent files will // keep the file system from being unmounted, for what that's worth.) // - // At least on OS X, you can determine whether a file is on an + // At least on macOS, you can determine whether a file is on an // automounted file system by calling statfs() on its path and // checking whether MNT_AUTOMOUNTED is set in f_flags. FreeBSD // appears to support that flag as well, but no other *BSD appears @@ -824,7 +824,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) : // Application-wide style sheet QString app_style_sheet = qApp->styleSheet(); #if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0) - // Qt uses the HITheme API to draw splitters. In recent versions of OS X + // Qt uses the HITheme API to draw splitters. In recent versions of macOS // this looks particularly bad: https://bugreports.qt.io/browse/QTBUG-43425 // This doesn't look native but it looks better than Yosemite's bit-rotten // rendering of HIThemeSplitterDrawInfo. @@ -898,7 +898,7 @@ void WiresharkApplication::emitAppSignal(AppSignal signal) // Flush any collected app signals. // -// On OS X emitting PacketDissectionChanged from a dialog can +// On macOS emitting PacketDissectionChanged from a dialog can // render the application unusable: // https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11361 // https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11448 diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index f992192b39..68706699db 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -84,7 +84,7 @@ public: void registerUpdate(register_action_e action, const char *message); void emitAppSignal(AppSignal signal); // Emitting app signals (PacketDissectionChanged in particular) from - // dialogs on OS X can be problematic. Dialogs should call queueAppSignal + // dialogs on macOS can be problematic. Dialogs should call queueAppSignal // instead. void queueAppSignal(AppSignal signal) { app_signals_ << signal; } // Flush queued app signals. Should be called from the main window after |