gr-qtgui: tightening up and cleaning up some memory leaks.

3 files changed, 12 insertions, 2 deletions

diff --git a/gr-qtgui/lib/qtgui.h b/gr-qtgui/lib/qtgui.h
index 9831697ac..27279e5cd 100644
--- a/gr-qtgui/lib/qtgui.h
+++ b/gr-qtgui/lib/qtgui.h
@@ -40,6 +40,8 @@ public:
     //nop
   }
 
+  ~qtgui_event() {}
+
   void lock()
   {
     d_mutex.lock();
@@ -58,7 +60,9 @@ public:
     : QObject(p)
   { 
   }
-  
+
+  ~qtgui_obj() {}
+
   void customEvent(QEvent *e)
   {
     if(e->type() == (QEvent::Type)(QEvent::User+101)) {
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index dee7c2f43..405971aa0 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -93,6 +93,7 @@ qtgui_sink_c::~qtgui_sink_c()
   delete d_main_gui;
   delete [] d_residbuf;
   delete d_fft;
+  delete d_object;
 }
 
 void
@@ -111,7 +112,7 @@ qtgui_sink_c::initialize(const bool opengl)
     d_qApplication = qApp;
   }
   else {
-    int argc;
+    int argc=0;
     char **argv = NULL;
     d_qApplication = new QApplication(argc, argv);
   }
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index e0509a294..b5d4bf4d7 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -74,6 +74,11 @@ SpectrumDisplayForm::~SpectrumDisplayForm()
   delete[] _realFFTDataPoints;
   delete[] _averagedValues;
 
+  delete _frequencyDisplayPlot;
+  delete _waterfallDisplayPlot;
+  delete _timeDomainDisplayPlot;
+  delete _constellationDisplayPlot;
+
   for(unsigned int count = 0; count < _historyVector->size(); count++){
     delete[] _historyVector->operator[](count);
   }