Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated Q_OS_MACX with Q_OS_MACOS #3227

Merged
merged 1 commit into from
Feb 17, 2024
Merged

Replace deprecated Q_OS_MACX with Q_OS_MACOS #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#if defined( _WIN32 ) && !defined( JACK_ON_WINDOWS )
# include "sound/asio/sound.h"
#else
# if ( defined( Q_OS_MACX ) ) && !defined( JACK_REPLACES_COREAUDIO )
# if ( defined( Q_OS_MACOS ) ) && !defined( JACK_REPLACES_COREAUDIO )
# include "sound/coreaudio-mac/sound.h"
# else
# if defined( Q_OS_IOS )
Expand Down
2 changes: 1 addition & 1 deletion src/clientdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ void CClientDlg::SetMyWindowTitle ( const int iNumClients )

setWindowTitle ( strWinTitle );

#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
// for MacOS only we show the number of connected clients as a
// badge label text if more than one user is connected
if ( iNumClients > 1 )
Expand Down
2 changes: 1 addition & 1 deletion src/clientdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "connectdlg.h"
#include "analyzerconsole.h"
#include "ui_clientdlgbase.h"
#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
# include "mac/badgelabel.h"
#endif

Expand Down
12 changes: 6 additions & 6 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#ifdef ANDROID
# include <QtAndroidExtras/QtAndroid>
#endif
#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
# include "mac/activity.h"
extern void qt_set_sequence_auto_mnemonic ( bool bEnable );
#endif
Expand All @@ -60,7 +60,7 @@ extern void qt_set_sequence_auto_mnemonic ( bool bEnable );
int main ( int argc, char** argv )
{

#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
// Mnemonic keys are default disabled in Qt for MacOS. The following function enables them.
// Qt will not show these with underline characters in the GUI on MacOS. (#1873)
qt_set_sequence_auto_mnemonic ( true );
Expand All @@ -74,7 +74,7 @@ int main ( int argc, char** argv )

// initialize all flags and string which might be changed by command line
// arguments
#if ( defined( SERVER_BUNDLE ) && defined( Q_OS_MACX ) ) || defined( SERVER_ONLY )
#if ( defined( SERVER_BUNDLE ) && defined( Q_OS_MACOS ) ) || defined( SERVER_ONLY )
// if we are on MacOS and we are building a server bundle or requested build with serveronly, start Jamulus in server mode
bool bIsClient = false;
qInfo() << "- Starting in server mode by default (due to compile time option)";
Expand Down Expand Up @@ -585,7 +585,7 @@ int main ( int argc, char** argv )

// clicking on the Mac application bundle, the actual application
// is called with weird command line args -> do not exit on these
#if !( defined( Q_OS_MACX ) )
#if !( defined( Q_OS_MACOS ) )
exit ( 1 );
#endif
}
Expand Down Expand Up @@ -850,7 +850,7 @@ int main ( int argc, char** argv )
pApp->addLibraryPath ( QString ( ApplDir.absolutePath() ) );
#endif

#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
// On OSX we need to declare an activity to ensure the process doesn't get
// throttled by OS level Nap, Sleep, and Thread Priority systems.
CActivity activity;
Expand Down Expand Up @@ -1065,7 +1065,7 @@ int main ( int argc, char** argv )
}
}

#if defined( Q_OS_MACX )
#if defined( Q_OS_MACOS )
activity.EndActivity();
#endif

Expand Down
Loading