From 0ede2311faefd5bc8a52dda33d866bd9f3db7428 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 19 Oct 2014 06:32:03 +0200 Subject: reduce leakage somewhat by using shared_ptr Found-by: valgrind --- facetracknoir/facetracknoir.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'facetracknoir/facetracknoir.h') diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index 040bb170..b13f73f0 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -67,14 +67,14 @@ public: // XXX this shit stinks -sh 20141004 // TODO move to separate class representing running tracker state - DynamicLibrary* current_tracker1() override { - return dlopen_trackers.value(ui.iconcomboTrackerSource->currentIndex(), (DynamicLibrary*) NULL); + ptr current_tracker1() override { + return dlopen_trackers.value(ui.iconcomboTrackerSource->currentIndex(), nullptr); } - DynamicLibrary* current_protocol() override { - return dlopen_protocols.value(ui.iconcomboProtocol->currentIndex(), (DynamicLibrary*) NULL); + ptr current_protocol() override { + return dlopen_protocols.value(ui.iconcomboProtocol->currentIndex(), nullptr); } - DynamicLibrary* current_filter() override { - return dlopen_filters.value(ui.iconcomboFilter->currentIndex(), (DynamicLibrary*) NULL); + ptr current_filter() override { + return dlopen_filters.value(ui.iconcomboFilter->currentIndex(), nullptr); } #if defined(_WIN32) @@ -108,9 +108,9 @@ private: void loadSettings(); void updateButtonState(bool running, bool inertialp); - QList dlopen_filters; - QList dlopen_trackers; - QList dlopen_protocols; + QList> dlopen_filters; + QList> dlopen_trackers; + QList> dlopen_protocols; QShortcut kbd_quit; int looping; -- cgit v1.2.3