From 2608d1ecc07eeaaff9c581659b0a596f6c0ba3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haris=20Gu=C5=A1i=C4=87?= Date: Mon, 2 Aug 2021 15:00:27 +0200 Subject: [PATCH] Fix issue #1794 (#1795) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Haris Gušić --- src/tools/toolfactory.cpp | 2 +- src/utils/confighandler.cpp | 4 ++-- src/utils/configshortcuts.cpp | 2 +- src/widgets/capture/capturetoolbutton.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/toolfactory.cpp b/src/tools/toolfactory.cpp index 698ad97f..2dc146a2 100644 --- a/src/tools/toolfactory.cpp +++ b/src/tools/toolfactory.cpp @@ -80,7 +80,7 @@ CaptureTool* ToolFactory::CreateTool(CaptureToolButton::ButtonType t, case CaptureToolButton::TYPE_REDO: tool = new RedoTool(parent); break; -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) case CaptureToolButton::TYPE_OPEN_APP: tool = new AppLauncher(parent); break; diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 1e77d30f..0b777e80 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -50,7 +50,7 @@ QVector ConfigHandler::getButtons() << CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE << CaptureToolButton::TYPE_EXIT << CaptureToolButton::TYPE_IMAGEUPLOADER -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) << CaptureToolButton::TYPE_OPEN_APP #endif << CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT @@ -573,7 +573,7 @@ void ConfigHandler::setCopyPathAfterSaveEnabled(const bool value) bool ConfigHandler::useJpgForClipboard() const { -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) // FIXME - temporary fix to disable option for MacOS if (m_settings.contains(QStringLiteral("useJpgForClipboard"))) { return m_settings.value(QStringLiteral("useJpgForClipboard")).toBool(); diff --git a/src/utils/configshortcuts.cpp b/src/utils/configshortcuts.cpp index db07dab9..c57033b4 100644 --- a/src/utils/configshortcuts.cpp +++ b/src/utils/configshortcuts.cpp @@ -145,7 +145,7 @@ const QKeySequence& ConfigShortcuts::captureShortcutDefault( case CaptureToolButton::ButtonType::TYPE_IMAGEUPLOADER: m_ks = QKeySequence(Qt::CTRL + Qt::Key_U); break; -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) case CaptureToolButton::ButtonType::TYPE_OPEN_APP: m_ks = QKeySequence(Qt::CTRL + Qt::Key_O); break; diff --git a/src/widgets/capture/capturetoolbutton.cpp b/src/widgets/capture/capturetoolbutton.cpp index bb4c8a25..c3788e52 100644 --- a/src/widgets/capture/capturetoolbutton.cpp +++ b/src/widgets/capture/capturetoolbutton.cpp @@ -137,7 +137,7 @@ static std::map buttonTypeOrder { CaptureToolButton::TYPE_COPY, 14 }, { CaptureToolButton::TYPE_SAVE, 15 }, { CaptureToolButton::TYPE_IMAGEUPLOADER, 16 }, -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) { CaptureToolButton::TYPE_OPEN_APP, 17 }, { CaptureToolButton::TYPE_EXIT, 18 }, { CaptureToolButton::TYPE_PIN, 19 }, #else @@ -174,7 +174,7 @@ QVector CaptureToolButton::TYPE_SAVE, CaptureToolButton::TYPE_EXIT, CaptureToolButton::TYPE_IMAGEUPLOADER, -#if not defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) CaptureToolButton::TYPE_OPEN_APP, #endif CaptureToolButton::TYPE_PIN,