Fix compiler warnings.
This commit is contained in:
parent
b6ea17d506
commit
8527c5936c
|
@ -115,8 +115,7 @@ DialogFinalMeasurements::DialogFinalMeasurements(VPattern *doc, QWidget *parent)
|
||||||
|
|
||||||
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
||||||
{
|
{
|
||||||
connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated,
|
connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogFinalMeasurements::UpdateShortcuts);
|
||||||
this, &DialogFinalMeasurements::UpdateShortcuts);
|
|
||||||
UpdateShortcuts();
|
UpdateShortcuts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,8 +99,7 @@ DialogHistory::DialogHistory(VContainer *data, VPattern *doc, QWidget *parent)
|
||||||
|
|
||||||
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
||||||
{
|
{
|
||||||
connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated,
|
connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogHistory::UpdateShortcuts);
|
||||||
this, &DialogHistory::UpdateShortcuts);
|
|
||||||
UpdateShortcuts();
|
UpdateShortcuts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,8 +204,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
|
||||||
|
|
||||||
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
if (VAbstractShortcutManager *manager = VAbstractApplication::VApp()->GetShortcutManager())
|
||||||
{
|
{
|
||||||
connect(VAbstractValApplication::VApp()->GetShortcutManager(), &VAbstractShortcutManager::ShortcutsUpdated,
|
connect(manager, &VAbstractShortcutManager::ShortcutsUpdated, this, &DialogIncrements::UpdateShortcuts);
|
||||||
this, &DialogIncrements::UpdateShortcuts);
|
|
||||||
UpdateShortcuts();
|
UpdateShortcuts();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,11 @@
|
||||||
#define VASPECTRATIOPIXMAPLABEL_H
|
#define VASPECTRATIOPIXMAPLABEL_H
|
||||||
|
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
#include <QPixmap>
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
|
||||||
|
#include "../vmisc/defglobal.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
class VAspectRatioPixmapLabel : public QLabel
|
class VAspectRatioPixmapLabel : public QLabel
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user