aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/main_window_slots.cpp
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-05 12:15:27 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-05 19:16:22 +0000
commit357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch)
tree58a77b4dc8e1192db6278716b320bf42a18ded8f /ui/qt/main_window_slots.cpp
parent1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff)
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/main_window_slots.cpp')
-rw-r--r--ui/qt/main_window_slots.cpp14
1 files changed, 7 insertions, 7 deletions
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();
}