From 065aa98ce433410261f44de559474be3e7e9cfe4 Mon Sep 17 00:00:00 2001 From: Sergey Zolotarev Date: Mon, 1 Nov 2021 14:59:51 +0600 Subject: [PATCH] Fix some compile warnings in macOS build (#2027) * Fix some compile warnings in macOS build * Update macOS Info.plist template --- cmake/modules/MacOSXBundleInfo.plist.in | 6 +++--- src/CMakeLists.txt | 6 ++++++ src/tools/text/textconfig.cpp | 14 ++++++-------- src/widgets/capture/capturewidget.cpp | 4 ++-- src/widgets/capture/colorpicker.h | 2 +- src/widgets/capture/notifierbox.h | 4 ++-- src/widgets/capture/selectionwidget.h | 6 +++--- src/widgets/panel/colorgrabwidget.h | 2 +- 8 files changed, 24 insertions(+), 20 deletions(-) diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index 50b08dd3..4100a011 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile flameshot CFBundleIdentifier - https://flameshot.org/ + @MACOSX_BUNDLE_IDENTIFIER@ CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -23,9 +23,9 @@ CFBundleSignature ???? CFBundleVersion - 0.10.1 + @PROJECT_VERSION@ CFBundleLongVersionString - 0.10.1 + @PROJECT_VERSION@ CSResourcesFileMapped NSHumanReadableCopyright diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 899c316f..42af5931 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,6 +183,12 @@ target_link_libraries( ) if (APPLE) + set(MACOSX_BUNDLE_IDENTIFIER "org.flameshot") + set_target_properties( + flameshot + PROPERTIES + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${MACOSX_BUNDLE_IDENTIFIER} + ) target_link_libraries( flameshot qhotkey diff --git a/src/tools/text/textconfig.cpp b/src/tools/text/textconfig.cpp index 4efef972..0e0ba76b 100644 --- a/src/tools/text/textconfig.cpp +++ b/src/tools/text/textconfig.cpp @@ -152,25 +152,23 @@ void TextConfig::weightButtonPressed(const bool w) void TextConfig::setTextAlignment(Qt::AlignmentFlag alignment) { - switch (alignment) { - case (Qt::AlignLeft): - m_leftAlignButton->setChecked(true); - m_centerAlignButton->setChecked(false); - m_rightAlignButton->setChecked(false); - break; - case (Qt::AlignCenter): m_leftAlignButton->setChecked(false); m_centerAlignButton->setChecked(true); m_rightAlignButton->setChecked(false); break; - case (Qt::AlignRight): m_leftAlignButton->setChecked(false); m_centerAlignButton->setChecked(false); m_rightAlignButton->setChecked(true); break; + case (Qt::AlignLeft): + default: + m_leftAlignButton->setChecked(true); + m_centerAlignButton->setChecked(false); + m_rightAlignButton->setChecked(false); + break; } emit alignmentChanged(alignment); } diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp index a9e90534..510192a4 100644 --- a/src/widgets/capture/capturewidget.cpp +++ b/src/widgets/capture/capturewidget.cpp @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors // Based on Lightscreen areadialog.cpp, Copyright 2017 Christian Kaiser @@ -506,7 +506,7 @@ void CaptureWidget::showColorPicker(const QPoint& pos) { // Try to select new object if current pos out of active object auto toolItem = activeToolObject(); - if (!toolItem || toolItem && !toolItem->boundingRect().contains(pos)) { + if (!toolItem || (toolItem && !toolItem->boundingRect().contains(pos))) { selectToolItemAtPos(pos); } diff --git a/src/widgets/capture/colorpicker.h b/src/widgets/capture/colorpicker.h index 6476ebd1..44778b5e 100644 --- a/src/widgets/capture/colorpicker.h +++ b/src/widgets/capture/colorpicker.h @@ -17,7 +17,7 @@ class ColorPicker : public QWidget protected: void paintEvent(QPaintEvent* event) override; void repaint(int i, QPainter& painter); - void mouseMoveEvent(QMouseEvent*); + void mouseMoveEvent(QMouseEvent*) override; void showEvent(QShowEvent* event) override; void hideEvent(QHideEvent* event) override; diff --git a/src/widgets/capture/notifierbox.h b/src/widgets/capture/notifierbox.h index 6d581954..d9ab367e 100644 --- a/src/widgets/capture/notifierbox.h +++ b/src/widgets/capture/notifierbox.h @@ -14,8 +14,8 @@ class NotifierBox : public QWidget explicit NotifierBox(QWidget* parent = nullptr); protected: - virtual void enterEvent(QEvent*); - virtual void paintEvent(QPaintEvent*); + virtual void enterEvent(QEvent*) override; + virtual void paintEvent(QPaintEvent*) override; signals: void hidden(); diff --git a/src/widgets/capture/selectionwidget.h b/src/widgets/capture/selectionwidget.h index 8f5a24d7..edb87b68 100644 --- a/src/widgets/capture/selectionwidget.h +++ b/src/widgets/capture/selectionwidget.h @@ -46,9 +46,9 @@ class SelectionWidget : public QWidget void parentMouseReleaseEvent(QMouseEvent* e); void parentMouseMoveEvent(QMouseEvent* e); - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); - void moveEvent(QMoveEvent*); + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; + void moveEvent(QMoveEvent*) override; void showEvent(QShowEvent*) override; void hideEvent(QHideEvent*) override; diff --git a/src/widgets/panel/colorgrabwidget.h b/src/widgets/panel/colorgrabwidget.h index c2cf4a04..dd04e76e 100644 --- a/src/widgets/panel/colorgrabwidget.h +++ b/src/widgets/panel/colorgrabwidget.h @@ -23,7 +23,7 @@ class ColorGrabWidget : public QWidget private: bool eventFilter(QObject* obj, QEvent* event) override; - void paintEvent(QPaintEvent* e); + void paintEvent(QPaintEvent* e) override; void showEvent(QShowEvent* event) override; QPoint cursorPos() const;