From 8527c5936c95fcdc45b035e8101b54a03280e3fc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 24 Oct 2023 08:29:03 +0300 Subject: [PATCH] Fix compiler warnings. --- src/app/valentina/dialogs/dialogfinalmeasurements.cpp | 3 +-- src/app/valentina/dialogs/dialoghistory.cpp | 3 +-- src/app/valentina/dialogs/dialogincrements.cpp | 3 +-- src/libs/vwidgets/vaspectratiopixmaplabel.h | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp index 85387a2e3..78581b592 100644 --- a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp +++ b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp @@ -115,8 +115,7 @@ DialogFinalMeasurements::DialogFinalMeasurements(VPattern *doc, QWidget *parent) if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager()) { - connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated, - this, &DialogFinalMeasurements::UpdateShortcuts); + connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogFinalMeasurements::UpdateShortcuts); UpdateShortcuts(); } } diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index d52fa7320..c06c38644 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -99,8 +99,7 @@ DialogHistory::DialogHistory(VContainer *data, VPattern *doc, QWidget *parent) if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager()) { - connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated, - this, &DialogHistory::UpdateShortcuts); + connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogHistory::UpdateShortcuts); UpdateShortcuts(); } } diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 8379d6196..bf58b0d9c 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -204,8 +204,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager()) { - connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated, - this, &DialogIncrements::UpdateShortcuts); + connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogIncrements::UpdateShortcuts); UpdateShortcuts(); } } diff --git a/src/libs/vwidgets/vaspectratiopixmaplabel.h b/src/libs/vwidgets/vaspectratiopixmaplabel.h index f43325bf8..194bb0014 100644 --- a/src/libs/vwidgets/vaspectratiopixmaplabel.h +++ b/src/libs/vwidgets/vaspectratiopixmaplabel.h @@ -29,6 +29,11 @@ #define VASPECTRATIOPIXMAPLABEL_H #include +#include + +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) +#include "../vmisc/defglobal.h" +#endif class VAspectRatioPixmapLabel : public QLabel {