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

Code refactoring - remove Q_OS_MAC (deprecated synonym for Q_OS_DARWIN)

Browse Source 
(cherry picked from commit aff1649670aa5ba64f2927933a29c62b06fee21f)
This commit is contained in:
Yuriy Puchkov
2021-02-10 19:44:08 +02:00
parent d4706b3096
commit a893fdfc75
18 changed files with 76 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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