Skip to content

Commit eda12cf

Browse files
committed
Fix crash on destruct #242
1 parent c75e478 commit eda12cf

39 files changed

+71
-215
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change log
22

3+
## Release 0.5.1
4+
* Fixed: Crashes on destruction. ([#242](https://github.com/ksnip/kImageAnnotator/issues/242))
5+
36
## Release 0.5.0
47
* New: Add function for loading translations. ([#173](https://github.com/ksnip/kImageAnnotator/issues/173))
58
* New: Add a new tool for creating resizable movable duplicates of regions. ([#131](https://github.com/ksnip/kImageAnnotator/issues/131))

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(kImageAnnotator LANGUAGES CXX VERSION 0.5.0)
2+
project(kImageAnnotator LANGUAGES CXX VERSION 0.5.1)
33

44
set(CMAKE_CXX_STANDARD 11)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# kImageAnnotator [![Build Status][travis-badge]][travis-url] [![Translation status][weblate-badge]][weblate-url]
22
Tool for annotating images
33

4-
Version 0.5.0
4+
Version 0.5.1
55

66
![kImageAnnotator](https://i.imgur.com/4vlPDUn.png "kImageAnnotator")
77

src/gui/annotator/docks/AnnotationDockWidgetDragHandle.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ AnnotationDockWidgetDragHandle::AnnotationDockWidgetDragHandle(QWidget *parent)
3636
initGui();
3737
}
3838

39-
AnnotationDockWidgetDragHandle::~AnnotationDockWidgetDragHandle()
40-
{
41-
delete mLabel;
42-
delete mLayout;
43-
}
44-
4539
QSize AnnotationDockWidgetDragHandle::sizeHint() const
4640
{
4741
return QWidget::sizeHint();

src/gui/annotator/docks/AnnotationDockWidgetDragHandle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AnnotationDockWidgetDragHandle : public QWidget
3535
Q_OBJECT
3636
public:
3737
explicit AnnotationDockWidgetDragHandle(QWidget *parent);
38-
~AnnotationDockWidgetDragHandle() override;
38+
~AnnotationDockWidgetDragHandle() override = default;
3939
QSize sizeHint() const override;
4040
QSize minimumSizeHint() const override;
4141
void setOrientation(Qt::Orientation orientation);

src/gui/annotator/settings/AnnotationGeneralSettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ AnnotationGeneralSettings::AnnotationGeneralSettings() :
3131
AnnotationGeneralSettings::~AnnotationGeneralSettings()
3232
{
3333
delete mZoomPicker;
34-
delete mMainLayout;
3534
}
3635

3736
void AnnotationGeneralSettings::initGui()

src/gui/annotator/settings/AnnotationImageSettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ AnnotationImageSettings::AnnotationImageSettings() :
3131
AnnotationImageSettings::~AnnotationImageSettings()
3232
{
3333
delete mEffectPicker;
34-
delete mMainLayout;
3534
}
3635

3736
ImageEffects AnnotationImageSettings::effect() const

src/gui/annotator/settings/AnnotationItemSettings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ AnnotationItemSettings::~AnnotationItemSettings()
4747
delete mStickerPicker;
4848
delete mShadowPicker;
4949
delete mFontPicker;
50-
delete mMainLayout;
5150
qDeleteAll(mSeparators);
5251
}
5352

src/gui/annotator/settings/AnnotationToolSelection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ AnnotationToolSelection::AnnotationToolSelection() :
3737

3838
AnnotationToolSelection::~AnnotationToolSelection()
3939
{
40-
delete mMainLayout;
4140
delete mToolPicker;
4241
}
4342

src/gui/annotator/tabs/AnnotationTabContent.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ AnnotationTabContent::AnnotationTabContent(const QPixmap &pixmap, Config *config
3838

3939
AnnotationTabContent::~AnnotationTabContent()
4040
{
41-
delete mMainLayout;
4241
delete mAnnotationArea;
4342
delete mAnnotationView;
4443
}

0 commit comments

Comments
 (0)