benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring - remove Q_OS_MACX (is not required, is covered by Q_OS_DARWIN)

Browse Source 
(cherry picked from commit 00b9aae5266aaffb9a01a6f689e1829ae8218bdc)
This commit is contained in:
Yuriy Puchkov
2021-02-17 14:50:34 +02:00
parent dd54d028a1
commit a5cd4cd1bc
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/confighandler.cpp
View File

@@ -62,7 +62,7 @@ QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons()
<< CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE
<< CaptureToolButton::TYPE_EXIT
<< CaptureToolButton::TYPE_IMAGEUPLOADER
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
<< CaptureToolButton::TYPE_OPEN_APP
#endif
<< CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT
@@ -324,7 +324,7 @@ void ConfigHandler::setCheckForUpdates(const bool checkForUpdates)
bool ConfigHandler::startupLaunchValue()
{
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
bool res = false;
#else
bool res = true;
@@ -363,7 +363,7 @@ void ConfigHandler::setStartupLaunch(const bool start)
if (start == m_settings.value(QStringLiteral("startupLaunch")).toBool()) {
return;
}
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
/* TODO - there should be more correct way via API, but didn't find it
without extra dependencies, there should be something like that:
https://stackoverflow.com/questions/3358410/programmatically-run-at-startup-on-mac-os-x

4
src/utils/screenshotsaver.cpp
View File

@@ -27,7 +27,7 @@
#include <QImageWriter>
#include <QMessageBox>
#include <QMimeData>
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#include "src/widgets/capture/capturewidget.h"
#endif
@@ -120,7 +120,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
while (!ok) {
ConfigHandler config;
QString savePath = FileNameHandler().absoluteSavePath();
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
for (QWidget* widget : qApp->topLevelWidgets()) {
QString className(widget->metaObject()->className());
if (0 == className.compare(