diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-11-30 09:18:04 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-30 09:28:42 -0800 |
| commit | b22f1da59e37ff4ba871fb2d6c72ee3ec87b4c5b (patch) | |
| tree | 6548f4639be3261e2db66657b50a6fd095d3a577 /qt-ui/diveplanner.cpp | |
| parent | bd7ded88940995ebbb46fc6983ba9cfd179e55e0 (diff) | |
| download | subsurface-b22f1da59e37ff4ba871fb2d6c72ee3ec87b4c5b.tar.gz | |
Fix all leak-at-exit from singletons in Subsurface
Subsurface creates a lot of singleton instances on demand, but nothing
ever deleted them. Since they are singletons, these memory allocations
are technically not leaks. However, they clutter the output in valgrind
and other memory analysers, hiding the real issues.
The solution is to delete these items at exit. For the models and for
gettextFromC, the solution is to use a QScopedPointer, which will delete
its payload when it gets destroyed. For the dialogs and other widgets,
we can't do that: they need to be deleted before QApplication exits, so
we just set the parent in all of them to the main window.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/diveplanner.cpp')
| -rw-r--r-- | qt-ui/diveplanner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index b18f56bd6..a80ae68ae 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -1104,8 +1104,8 @@ DivePlannerPointsModel::DivePlannerPointsModel(QObject* parent): QAbstractTableM DivePlannerPointsModel* DivePlannerPointsModel::instance() { - static DivePlannerPointsModel* self = new DivePlannerPointsModel(); - return self; + static QScopedPointer<DivePlannerPointsModel> self(new DivePlannerPointsModel()); + return self.data(); } void DivePlannerPointsModel::setBottomSac(int sac) |