Make module instances unique ptrs

app/CalypAppModuleIf.cpp

@@ -29,11 +29,13 @@
 #include <QDockWidget>
 
 #include "VideoSubWindow.h"
+#include "lib/CalypFrame.h"
+#include "lib/CalypStream.h"
 
-CalypAppModuleIf::CalypAppModuleIf( QObject* parent, QAction* action, CalypModuleIf* module )
+CalypAppModuleIf::CalypAppModuleIf( QObject* parent, QAction* action, CalypModulePtr&& module )
     : m_bIsRunning( false )
     , m_pcModuleAction( action )
-    , m_pcModule( module )
+    , m_pcModule( std ::move( module ) )
     , m_pcDisplaySubWindow( NULL )
     , m_pcDockWidget( NULL )
     , m_pcModuleDock( NULL )
@@ -184,7 +186,7 @@ void CalypAppModuleIf::show()
     }
     break;
   case CLP_FRAME_MEASUREMENT_MODULE:
-    m_pcModuleDock->setModulueReturnValue( m_dMeasurementResult );
+    m_pcModuleDock->setModuleReturnValue( m_dMeasurementResult );
     break;
   }
 }
@@ -230,7 +232,6 @@ void CalypAppModuleIf::destroy()
   if( m_pcModule )
   {
     m_pcModule->destroy();
-    m_pcModule->Delete();
-    m_pcModule = NULL;
+    m_pcModule = nullptr;
   }
 }

app/CalypAppModuleIf.h

@@ -38,12 +38,14 @@
 
 #include "CommonDefs.h"
 #include "ModuleHandleDock.h"
-#include "lib/CalypFrame.h"
+// #include "lib/CalypFrame.h"
 #include "lib/CalypModuleIf.h"
-#include "lib/CalypStream.h"
+// #include "lib/CalypStream.h"
 
 class QAction;
 class QDockWidget;
+class CalypStream;
+class CalypFrame;
 
 #define CLP_MODULE_MAX_NUM_FRAMES 5
 
@@ -65,7 +67,7 @@ private:
   bool m_bSuccess;
 
   QAction* m_pcModuleAction;
-  CalypModuleIf* m_pcModule;
+  CalypModulePtr m_pcModule;
 
   VideoSubWindow* m_pcSubWindow[CLP_MODULE_MAX_NUM_FRAMES];
 
@@ -92,7 +94,7 @@ public:
     CalypAppModuleIf* m_pcModule;
   };
 
-  CalypAppModuleIf( QObject* parent, QAction* action, CalypModuleIf* module );
+  CalypAppModuleIf( QObject* parent, QAction* action, CalypModulePtr&& module );
   virtual ~CalypAppModuleIf() {}
   QList<VideoSubWindow*> getSubWindowList()
   {
@@ -103,7 +105,7 @@ public:
     return arraySubWindows;
   }
 
-  CalypModuleIf* getModule() { return m_pcModule; }
+  CalypModuleIf* getModule() { return m_pcModule.get(); }
   unsigned int getModuleRequirements() { return m_pcModule->m_uiModuleRequirements; }
   ClpString moduleInfo() { return m_pcModule->moduleInfo(); }
   void update( bool isPlaying );

app/ModulesHandle.cpp

@@ -91,7 +91,6 @@ QMenu* ModulesHandle::createMenu()
 
 void ModulesHandle::buildMenu()
 {
-  CalypModuleIf* pcCurrModuleIf;
   QString ModuleIfinternalName;
   QAction* currAction;
   QMenu* currSubMenu;
@@ -108,7 +107,7 @@ void ModulesHandle::buildMenu()
   CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
   for( ; it != moduleFactoryMap.end(); ++it )
   {
-    pcCurrModuleIf = it->second();
+    auto pcCurrModuleIf = it->second();
     ModuleIfinternalName = QString::fromLocal8Bit( it->first );
 
     currSubMenu = NULL;
@@ -147,8 +146,6 @@ void ModulesHandle::buildMenu()
       currSubMenu->addAction( currAction );
     else
       m_pcModulesMenu->addAction( currAction );
-
-    pcCurrModuleIf->Delete();
   }
 
   m_pcModulesMenu->addAction( m_arrayActions[LOAD_EXTERNAL_ACT] );
@@ -278,9 +275,8 @@ void ModulesHandle::activateModule()
   }
 
   QString ModuleIfName = pcAction->data().toString();
-  CalypModuleIf* pcCurrModuleIf =
-      CalypModulesFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
-  CalypAppModuleIf* pcCurrAppModuleIf = new CalypAppModuleIf( this, pcAction, pcCurrModuleIf );
+  auto pcCurrModuleIf = CalypModulesFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
+  CalypAppModuleIf* pcCurrAppModuleIf = new CalypAppModuleIf( this, pcAction, std::move( pcCurrModuleIf ) );
 
   QList<VideoSubWindow*> videoSubWindowList;
   int numberOfFrames = pcCurrAppModuleIf->m_pcModule->m_uiNumberOfFrames;

app/docks/ModuleHandleDock.cpp

@@ -60,7 +60,7 @@ ModuleHandleDock::ModuleHandleDock( QWidget* parent, CalypAppModuleIf* moduleIf
 
 ModuleHandleDock::~ModuleHandleDock() {}
 
-void ModuleHandleDock::setModulueReturnValue( double value )
+void ModuleHandleDock::setModuleReturnValue( double value )
 {
   labelModulueReturnValue->clear();
   QString strValue = QString( "%1" ).arg( value );

app/docks/ModuleHandleDock.h

@@ -42,7 +42,7 @@ public:
   ModuleHandleDock( QWidget* parent, CalypAppModuleIf* moduleIf );
   ~ModuleHandleDock();
 
-  void setModulueReturnValue( double value );
+  void setModuleReturnValue( double value );
 
   QSize sizeHint() const;