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-10 20:01:12 +02:00
parent 296bed0491
commit dd54d028a1
15 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/text/texttool.cpp
View File

@@ -130,7 +130,7 @@ CaptureTool* TextTool::copy(QObject* parent)
void TextTool::undo(QPixmap& pixmap)
{
QPainter p(&pixmap);
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
// Not sure how will it work on 4k and fullHd on Linux or Windows with a
// capture of different displays with different DPI, so let it be MacOS
// specific only.
@@ -165,7 +165,7 @@ QRect TextTool::backupRect(const QPixmap& pixmap) const
{
const QRect& limits = pixmap.rect();
QRect r = m_backupArea.normalized();
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
const qreal pixelRatio = pixmap.devicePixelRatio();
const int val = 5 * pixelRatio;
if (1 != pixelRatio) {