Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Replace deprecated define

Browse Source
This commit is contained in:
Elias Steurer 2023-11-09 18:06:52 +01:00
parent 6e9f138e7e
commit 4849905a4a
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ScreenPlay/src/app.cpp
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only
#include "ScreenPlay/app.h"
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
#include "ScreenPlayUtil/macutils.h"
#endif
@ -75,7 +75,7 @@ App::App()
QGuiApplication::setQuitOnLastWindowClosed(false);
QString fontsPath = QGuiApplication::instance()->applicationDirPath() + "/assets/fonts/";
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
fontsPath = QGuiApplication::instance()->applicationDirPath() + "/../Resources/fonts/";
#endif
const QDir fontsDir(fontsPath);
@ -234,7 +234,7 @@ void App::exit()
void App::showDockIcon(const bool show)
{
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
MacUtils::instance()->showDockIcon(show);
#endif
}

2
ScreenPlay/src/createimportvideo.cpp
View File

@ -723,7 +723,7 @@ QString CreateImportVideo::waitForFinished(
m_process->setProgram(m_ffprobeExecutable);
}
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
QProcess changeChmod;
changeChmod.setProgram("chmod");
changeChmod.setArguments({ "+x", m_process->program() });

2
ScreenPlay/src/settings.cpp
View File

@ -60,7 +60,7 @@ Settings::Settings(const std::shared_ptr<GlobalVariables>& globalVariables,
#ifdef Q_OS_WIN
setDesktopEnvironment(DesktopEnvironment::Windows);
#endif
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
setDesktopEnvironment(DesktopEnvironment::OSX);
#endif
#ifdef Q_OS_LINUX

2
ScreenPlayUtil/src/util.cpp
View File

@ -131,7 +131,7 @@ QString executableAppEnding()
#ifdef Q_OS_WIN
return ".exe";
#endif
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
return ".app";
#endif
return "";

4
ScreenPlayWallpaper/main.cpp
View File

@ -18,7 +18,7 @@ Q_IMPORT_QML_PLUGIN(ScreenPlaySysInfoPlugin)
#elif defined(Q_OS_LINUX)
#include "src/linuxwaylandwindow.h"
#include "src/linuxx11window.h"
#elif defined(Q_OS_OSX)
#elif defined(Q_OS_MACOS)
#include "src/macwindow.h"
#endif
@ -49,7 +49,7 @@ int main(int argc, char* argv[])
} else if (platformName == "wayland") {
window = std::make_unique<LinuxWaylandWindow>();
}
#elif defined(Q_OS_OSX)
#elif defined(Q_OS_MACOS)
window = std::make_unique<MacWindow>();
#endif

4
ScreenPlayWidget/main.cpp
View File

@ -14,7 +14,7 @@
#if defined(Q_OS_WIN)
Q_IMPORT_QML_PLUGIN(ScreenPlaySysInfoPlugin)
#endif
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
#include "ScreenPlayUtil/macutils.h"
#endif
@ -92,7 +92,7 @@ int main(int argc, char* argv[])
argumentList.at(3), // Type
QPoint { positionX, positionY });
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
MacUtils::showDockIcon(false);
#endif
logging = std::make_unique<const ScreenPlayUtil::LoggingHandler>("ScreenPlayWidget_" + appID);