smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: use Q_OS_MACOS in place of depricated Q_OS_MAC

Browse source
This commit is contained in:
sithlord48 2026-08-22 10:48:35 -04:00 committed by Chris Rizzitello
parent 2e6f4ddf8b
commit cddf58684b
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/apps/deskflow-gui/deskflow-gui.cpp
View file

@ -32,7 +32,7 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#endif #endif
#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) #if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
#include "platform/XDGPortalRegistry.h" #include "platform/XDGPortalRegistry.h"
#endif #endif
@ -51,7 +51,7 @@ int main(int argc, char *argv[])
QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false")); QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true\nqt.*=false"));
#endif #endif
#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) #if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0)) if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0))
deskflow::platform::setAppId(); deskflow::platform::setAppId();
#endif #endif

2
src/lib/deskflow/App.cpp
View file

@ -22,7 +22,7 @@
#include <stdexcept> #include <stdexcept>
#if defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#endif #endif

4
src/lib/deskflow/ClientApp.cpp
View file

@ -37,7 +37,7 @@
#include "platform/EiScreen.h" #include "platform/EiScreen.h"
#endif #endif
#if defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
#endif #endif
@ -108,7 +108,7 @@ deskflow::Screen *ClientApp::createScreen()
), ),
getEvents() getEvents()
); );
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
return new deskflow::Screen( return new deskflow::Screen(
new OSXScreen(getEvents(), false, Settings::value(Settings::Client::LanguageSync).toBool()), getEvents() new OSXScreen(getEvents(), false, Settings::value(Settings::Client::LanguageSync).toBool()), getEvents()
); );

4
src/lib/deskflow/ServerApp.cpp
View file

@ -43,7 +43,7 @@
#include "platform/EiScreen.h" #include "platform/EiScreen.h"
#endif #endif
#if defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
#include "platform/OSXScreen.h" #include "platform/OSXScreen.h"
#endif #endif
@ -393,7 +393,7 @@ deskflow::Screen *ServerApp::createScreen()
return new deskflow::Screen( return new deskflow::Screen(
new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents() new MSWindowsScreen(true, Settings::value(Settings::Core::UseHooks).toBool(), getEvents()), getEvents()
); );
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
return new deskflow::Screen(new OSXScreen(getEvents(), true), getEvents()); return new deskflow::Screen(new OSXScreen(getEvents(), true), getEvents());
#else #else
if (deskflow::platform::isWayland()) { if (deskflow::platform::isWayland()) {

6
src/lib/deskflow/unix/AppUtilUnix.cpp
View file

@ -14,7 +14,7 @@
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <deskflow/unix/XkbLayoutsParser.h> #include <deskflow/unix/XkbLayoutsParser.h>
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <platform/OSXAutoTypes.h> #include <platform/OSXAutoTypes.h>
#endif #endif
@ -46,7 +46,7 @@ std::vector<std::string> AppUtilUnix::getKeyboardLayoutList()
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
layoutLangCodes = XkbLayoutsParser::getXkbLanguageList(); layoutLangCodes = XkbLayoutsParser::getXkbLanguageList();
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
CFStringRef keys[] = {kTISPropertyInputSourceCategory}; CFStringRef keys[] = {kTISPropertyInputSourceCategory};
CFStringRef values[] = {kTISCategoryKeyboardInputSource}; CFStringRef values[] = {kTISCategoryKeyboardInputSource};
AutoCFDictionary dict( AutoCFDictionary dict(
@ -142,7 +142,7 @@ std::string AppUtilUnix::getCurrentLanguageCode()
result = XkbLayoutsParser::convertLayoutToISO(result); result = XkbLayoutsParser::convertLayoutToISO(result);
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MACOS)
AutoTISInputSourceRef source(nullptr, CFRelease); AutoTISInputSourceRef source(nullptr, CFRelease);
CFArrayRef layoutLanguages = nullptr; CFArrayRef layoutLanguages = nullptr;
{ {

2
src/lib/gui/StyleUtils.h
View file

@ -60,7 +60,7 @@ inline QFont fixedFont()
QFont f = QFontDatabase::systemFont(QFontDatabase::FixedFont); QFont f = QFontDatabase::systemFont(QFontDatabase::FixedFont);
#endif #endif
#if defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
f.setPointSize(12); f.setPointSize(12);
#endif #endif
return f; return f;