From 8951c9bf04f4bd807fedc16a8c10d2c4dd4db047 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 26 Mar 2024 00:08:02 +0000 Subject: [PATCH] Replace deprecated Q_OS_MAC and Q_OS_MACX (#5068) --- src/gui/MainWindow.cc | 4 ++-- src/gui/OpenSCADApp.cc | 4 ++-- src/gui/Preferences.cc | 4 ++-- src/gui/QGLView.cc | 2 +- src/gui/ScintillaEditor.cc | 6 +++--- src/gui/TabManager.cc | 4 ++-- src/openscad.cc | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gui/MainWindow.cc b/src/gui/MainWindow.cc index 4bed03a21e..e4bfcfd1f9 100644 --- a/src/gui/MainWindow.cc +++ b/src/gui/MainWindow.cc @@ -66,7 +66,7 @@ #include "CSGTreeNormalizer.h" #include "QGLView.h" #include "MouseSelector.h" -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS #include "CocoaUtils.h" #endif #ifdef Q_OS_WIN @@ -3557,7 +3557,7 @@ void MainWindow::quit() QApplication::sendEvent(QApplication::instance(), &ev); if (ev.isAccepted()) QApplication::instance()->quit(); // FIXME: Cancel any CGAL calculations -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS CocoaUtils::endApplication(); #endif } diff --git a/src/gui/OpenSCADApp.cc b/src/gui/OpenSCADApp.cc index d832b6793f..93bc0438b3 100644 --- a/src/gui/OpenSCADApp.cc +++ b/src/gui/OpenSCADApp.cc @@ -1,6 +1,6 @@ #include "OpenSCADApp.h" #include "MainWindow.h" -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS #include "EventFilter.h" #endif @@ -12,7 +12,7 @@ OpenSCADApp::OpenSCADApp(int& argc, char **argv) : QApplication(argc, argv) { -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS this->installEventFilter(new SCADEventFilter(this)); #endif } diff --git a/src/gui/Preferences.cc b/src/gui/Preferences.cc index 80cd4a61ce..59783851e9 100644 --- a/src/gui/Preferences.cc +++ b/src/gui/Preferences.cc @@ -92,7 +92,7 @@ void Preferences::init() { this->defaultmap["advanced/customizerFontFamily"] = font2.family(); this->defaultmap["advanced/customizerFontSize"] = font2.pointSize(); -#if defined (Q_OS_MAC) +#ifdef Q_OS_MACOS this->defaultmap["editor/ctrlmousewheelzoom"] = false; #else this->defaultmap["editor/ctrlmousewheelzoom"] = true; @@ -874,7 +874,7 @@ void Preferences::fireEditorConfigChanged() const void Preferences::keyPressEvent(QKeyEvent *e) { -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS if (e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_Period) { close(); } else diff --git a/src/gui/QGLView.cc b/src/gui/QGLView.cc index b69a1d8774..4dfec2a872 100644 --- a/src/gui/QGLView.cc +++ b/src/gui/QGLView.cc @@ -298,7 +298,7 @@ void QGLView::mouseMoveEvent(QMouseEvent *event) mouse_drag_moved = true; auto button_compare = this->mouseSwapButtons?Qt::RightButton : Qt::LeftButton; if (event->buttons() & button_compare -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS && !(event->modifiers() & Qt::MetaModifier) #endif ) { diff --git a/src/gui/ScintillaEditor.cc b/src/gui/ScintillaEditor.cc index 243a0338dc..9d5097f171 100644 --- a/src/gui/ScintillaEditor.cc +++ b/src/gui/ScintillaEditor.cc @@ -138,7 +138,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent) // QsciCommand *c; // NOLINTBEGIN(bugprone-suspicious-enum-usage) -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS // Alt-Backspace should delete left word (Alt-Delete already deletes right word) c = qsci->standardCommands()->find(QsciCommand::DeleteWordLeft); c->setKey(Qt::Key_Backspace | Qt::ALT); @@ -154,7 +154,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent) c->setKey(Qt::Key_Z | Qt::CTRL | Qt::SHIFT); c->setAlternateKey(Qt::Key_Y | Qt::CTRL); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS const unsigned long modifier = Qt::META; #else const unsigned long modifier = Qt::CTRL; @@ -1079,7 +1079,7 @@ bool ScintillaEditor::handleKeyEventNavigateNumber(QKeyEvent *keyEvent) { static bool previewAfterUndo = false; -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS unsigned int navigateOnNumberModifiers = Qt::AltModifier | Qt::ShiftModifier | Qt::KeypadModifier; #else unsigned int navigateOnNumberModifiers = Qt::AltModifier; diff --git a/src/gui/TabManager.cc b/src/gui/TabManager.cc index 46f4910370..6977fe674b 100644 --- a/src/gui/TabManager.cc +++ b/src/gui/TabManager.cc @@ -573,7 +573,7 @@ bool TabManager::maybeSave(int x) box.setDefaultButton(QMessageBox::Save); box.setIcon(QMessageBox::Warning); box.setWindowModality(Qt::ApplicationModal); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS // Cmd-D is the standard shortcut for this button on Mac box.button(QMessageBox::Discard)->setShortcut(QKeySequence("Ctrl+D")); box.button(QMessageBox::Discard)->setShortcutEnabled(true); @@ -605,7 +605,7 @@ bool TabManager::shouldClose() box.setDefaultButton(QMessageBox::SaveAll); box.setIcon(QMessageBox::Warning); box.setWindowModality(Qt::ApplicationModal); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS // Cmd-D is the standard shortcut for this button on Mac box.button(QMessageBox::Discard)->setShortcut(QKeySequence("Ctrl+D")); box.button(QMessageBox::Discard)->setShortcutEnabled(true); diff --git a/src/openscad.cc b/src/openscad.cc index e89c523cc8..b125762e8d 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -745,7 +745,7 @@ int gui(vector& inputFiles, const fs::path& original_path, int argc, cha QGuiApplication::setApplicationDisplayName("OpenSCAD"); QGuiApplication::setDesktopFileName(DESKTOP_FILENAME); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS app.setWindowIcon(QIcon(":/icon-macos.png")); #else app.setWindowIcon(QIcon(":/logo.png")); @@ -764,7 +764,7 @@ int gui(vector& inputFiles, const fs::path& original_path, int argc, cha localization_init(); } -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS installAppleEventHandlers(); #endif @@ -868,7 +868,7 @@ int gui(const vector& inputFiles, const fs::path& original_path, int arg } #endif // OPENSCAD_QTGUI -#if defined(Q_OS_MACX) +#ifdef Q_OS_MACOS std::pair customSyntax(const string& s) { if (s.find("-psn_") == 0) return {"psn", s.substr(5)}; @@ -932,7 +932,7 @@ int main(int argc, char **argv) PlatformUtils::registerApplicationPath(fs::absolute(boost::filesystem::path(argv[0]).parent_path()).generic_string()); #endif -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS bool isGuiLaunched = getenv("GUI_LAUNCHED") != nullptr; auto nslog = [](const Message& msg, void *userdata) { CocoaUtils::nslog(msg.msg, userdata); @@ -1011,7 +1011,7 @@ int main(int argc, char **argv) po::options_description hidden("Hidden options"); hidden.add_options() -#ifdef Q_OS_MACX +#ifdef Q_OS_MACOS ("psn", po::value(), "process serial number") #endif ("input-file", po::value>(), "input file");