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

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

Browse Source 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
This commit is contained in:
Yuriy Puchkov
2021-02-10 20:12:25 +02:00
parent a5cd4cd1bc
commit ebdb3743dd
16 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/capture/capturetoolbutton.cpp
View File

@@ -134,7 +134,7 @@ static std::map<CaptureToolButton::ButtonType, int> buttonTypeOrder
{ CaptureToolButton::TYPE_COPY, 14 },
{ CaptureToolButton::TYPE_SAVE, 15 },
{ CaptureToolButton::TYPE_IMAGEUPLOADER, 16 },
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#if not defined(Q_OS_MACOS)
{ CaptureToolButton::TYPE_OPEN_APP, 17 },
{ CaptureToolButton::TYPE_EXIT, 18 }, { CaptureToolButton::TYPE_PIN, 19 },
#else
@@ -168,7 +168,7 @@ QVector<CaptureToolButton::ButtonType>
CaptureToolButton::TYPE_SAVE,
CaptureToolButton::TYPE_EXIT,
CaptureToolButton::TYPE_IMAGEUPLOADER,
#if not(defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#if not defined(Q_OS_MACOS)
CaptureToolButton::TYPE_OPEN_APP,
#endif
CaptureToolButton::TYPE_PIN,

2
src/widgets/capturelauncher.cpp
View File

@@ -60,7 +60,7 @@ CaptureLauncher::CaptureLauncher(QDialog* parent)
m_captureType->insertItem(
1, tr("Rectangular Region"), CaptureRequest::GRAPHICAL_MODE);
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#if defined(Q_OS_MACOS)
// Following to MacOS philosophy (one application cannot be displayed on
// more than one display)
m_captureType->insertItem(

4
src/widgets/panel/sidepanelwidget.cpp
View File

@@ -25,7 +25,7 @@
#include <QPushButton>
#include <QSlider>
#include <QVBoxLayout>
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#if defined(Q_OS_MACOS)
#include <QScreen>
#endif
@@ -165,7 +165,7 @@ QColor SidePanelWidget::grabPixmapColor(const QPoint& p)
{
QColor c;
if (m_pixmap) {
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
#if defined(Q_OS_MACOS)
QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
QPoint point = p;
if (currentScreen) {

6
src/widgets/panel/utilitypanel.cpp
View File

@@ -43,8 +43,7 @@ UtilityPanel::UtilityPanel(QWidget* parent)
m_internalPanel,
&QWidget::hide);
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
#if (defined(Q_OS_WIN) || defined(Q_OS_MACOS))
move(0, 0);
#endif
}
@@ -86,8 +85,7 @@ void UtilityPanel::show()
m_showAnimation->setEndValue(QRect(0, 0, width(), height()));
m_internalPanel->show();
m_showAnimation->start();
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
#if (defined(Q_OS_WIN) || defined(Q_OS_MACOS))
move(0, 0);
#endif
QWidget::show();