Refactor Playuver into Calyp

commit 1fd9cf34f06ba2a156919b5c9b73c31d4c6c6257
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Mar 12 18:06:39 2018 +0000

    Remove code style

commit 165588840126a7ab35b32e5be47f00c613829ef3
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Mar 12 18:06:25 2018 +0000

    Update Mainpage.dox

commit 5b1a2773c48697346c7b0b64519b81a5aecc0150
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Feb 19 03:46:24 2018 +0000

    Re-add CalypPixel.cpp but keep include with frame class

commit 2343be49ff4906c3171d2df7791e3cf34494eb21
Author: Joao Santos <joaompssantos@gmail.com>
Date:   Sun Feb 18 21:06:57 2018 +0000

    Fixed several things:
    - Removed unused define
    - Added: #include <cassert> to MainWindow.cpp
    - Fixed compilation issue when USE_FFMPEG is OFF on CalypStream.cpp

commit 8d1d64bac828a6bcdfa6af977a5d17d0792acb69
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 15 02:14:13 2018 +0000

    Fix several things:
    - Fix examples
    - Improve code formatting script
    - Change generated cmake config file

commit ea1d0265f1e9300f76fd3f0c8ca03d110ec13eaa
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 15 01:28:50 2018 +0000

    Fix dump of the module list: remove the use of char arrays

commit b4d19dda169715113a74713ca62d05f5a18fd0b5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 23:20:56 2018 +0000

    Increase linesize of tools help

commit 8b3eab54e376863276b0d7e032f9e1de8aaf90e5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 23:20:35 2018 +0000

    Fix CalypPixel

commit 1c6ba03c379518acf5fc6f1fdf328ca740a8851d
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 22:24:10 2018 +0000

    Enums CalypPixelFormats and CalypColorSpace are now class independent

commit 5dcc35e1716a70095e1720b01823c2e3a3980576
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 02:04:31 2018 +0000

    Change functions input and return types

commit 5514e3e24f9b428d5db71156561b2d8b6f61dd23
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 02:04:31 2018 +0000

    Change functions input and return types

commit fae7a9a91e1899e7a2833c634221f970d44b8fb6
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 01:39:14 2018 +0000

    Replace custom types with std ones

commit 0c3b62b8ea01903e213d9e8dd73a5b49c7c8c36e
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 00:37:18 2018 +0000

    Refactoring entries with Playuver name with Calyp
    Replace number of frames and add CLP tag into public definitions

commit e8cd8d7a219446513a5dda2c183dd892ec25a6f1
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 14:42:15 2018 +0000

    Fix min opencv version and missing ffmpeg module

commit 1233598af8ac15c88fa84569942cc6f865325452
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 03:10:12 2018 +0000

    Change version to 0.999.0 untill finishing refactoring

commit 1fe0cac8f0e70f352bf6c63b8cb2e06ab43fb633
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 00:21:47 2018 +0000

    Change project library

commit 44e9d330bc63b8b8a1687a14ff0be05af0bf2eb5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Fri Feb 9 01:42:58 2018 +0000

    Change doxygen files and upload new ico

commit 0d6f3408a2682cfac1533a57a2f1b4e2cc1f0f29
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 21:25:31 2018 +0000

    Fix logos - different when it is icon or the full logo

commit 9f3561acd4b51c7de5f21d63d7e8f2b43c253148
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 01:25:39 2018 +0000

    fix install files

commit 832154e3e40f17a863898a77c929a6c6850ffded
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 01:21:23 2018 +0000

    rename calip to calyp

commit 341b32bfcc0133fdbceea9b8390d59190e495b79
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 00:58:29 2018 +0000

    Refactor lib, modules and tools

commit b4b988cf80052fdcfe0e1f9099d5435ef7945584
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 00:02:33 2018 +0000

    Refactor classes and filename in app

commit 6b4ab728202531ad00db1e6299ee69a01f3594ba
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 7 17:49:53 2018 +0000

    Refactor about dialog and background logo

commit d5c954d39fb89d735c4feddf62f529077840ab6c
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 15:05:19 2018 +0000

    Added the misteriously missing new logo.

commit f40d81f765bfdd2dc89c0647cf5f4a80eef845c7
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 14:45:08 2018 +0000

    Added new logo to resource folder.

commit 52dc6d60d6590995d32de33f8199e954e0a6e120
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 14:41:13 2018 +0000

    Added new logo where it was previously forgotten.

commit 6d8e064c3154e5202f01b1b10ba6ab3637383ecd
Author: João Santos <joaompssantos@gmail.com>
Date:   Tue Feb 6 17:44:11 2018 +0000

    About window no longer resizable. Added new logo.

app/ModulesHandle.cpp

@@ -1,4 +1,4 @@
-/*    This file is a part of PlaYUVer project
+/*    This file is a part of Calyp project
  *    Copyright (C) 2014-2018  by Joao Carreira   (jfmcarreira@gmail.com)
  *                                Luis Lucas      (luisfrlucas@gmail.com)
  *
@@ -19,22 +19,22 @@
 
 /**
  * \file     ModulesHandle.cpp
- * \brief    PlaYUVer modules handle
+ * \brief    Calyp modules handle
  */
 
 #include "ModulesHandle.h"
 
-#include "DialogSubWindowSelector.h"
+#include "MainWindow.h"
 #include "ModulesHandleOptDialog.h"
-#include "PlaYUVerApp.h"
-#include "PlaYUVerSubWindowHandle.h"
+#include "SubWindowHandle.h"
+#include "SubWindowSelectorDialog.h"
 #include "VideoHandle.h"
 #include "VideoSubWindow.h"
-#include "modules/PlaYUVerModuleFactory.h"
+#include "modules/CalypModulesFactory.h"
 
 #include <cstdio>
 
-ModulesHandle::ModulesHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager, VideoHandle* moduleVideo )
+ModulesHandle::ModulesHandle( QWidget* parent, SubWindowHandle* windowManager, VideoHandle* moduleVideo )
     : QWidget( parent ), m_pcParent( parent ), m_pcMainWindowManager( windowManager ), m_appModuleVideo( moduleVideo )
 {
   setParent( m_pcParent );
@@ -42,7 +42,7 @@ ModulesHandle::ModulesHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowMa
 
 ModulesHandle::~ModulesHandle() {}
 
-Void ModulesHandle::createActions()
+void ModulesHandle::createActions()
 {
   m_arrayActions.resize( MODULES_TOTAL_ACT );
 
@@ -89,14 +89,14 @@ QMenu* ModulesHandle::createMenu()
   return m_pcModulesMenu;
 }
 
-Void ModulesHandle::buildMenu()
+void ModulesHandle::buildMenu()
 {
-  PlaYUVerModuleIf* pcCurrModuleIf;
-  QString ModuleIfInternalName;
+  CalypModuleIf* pcCurrModuleIf;
+  QString ModuleIfinternalName;
   QAction* currAction;
   QMenu* currSubMenu;
 
-  for( Int i = 0; i < m_arrayModulesActions.size(); i++ )
+  for( int i = 0; i < m_arrayModulesActions.size(); i++ )
   {
     delete m_arrayModulesActions.at( i );
   }
@@ -104,17 +104,17 @@ Void ModulesHandle::buildMenu()
   m_pcModulesMenu->clear();
   m_pcModulesSubMenuList.clear();
 
-  PlaYUVerModuleFactoryMap& PlaYUVerModuleFactoryMap = PlaYUVerModuleFactory::Get()->getMap();
-  PlaYUVerModuleFactoryMap::iterator it = PlaYUVerModuleFactoryMap.begin();
-  for( ; it != PlaYUVerModuleFactoryMap.end(); ++it )
+  CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
+  CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
+  for( ; it != moduleFactoryMap.end(); ++it )
   {
     pcCurrModuleIf = it->second();
-    ModuleIfInternalName = QString::fromLocal8Bit( it->first );
+    ModuleIfinternalName = QString::fromLocal8Bit( it->first );
 
     currSubMenu = NULL;
     if( pcCurrModuleIf->m_pchModuleCategory )
     {
-      for( Int j = 0; j < m_pcModulesSubMenuList.size(); j++ )
+      for( int j = 0; j < m_pcModulesSubMenuList.size(); j++ )
       {
         if( m_pcModulesSubMenuList.at( j )->title() == QString( pcCurrModuleIf->m_pchModuleCategory ) )
         {
@@ -135,7 +135,7 @@ Void ModulesHandle::buildMenu()
       moduleTooltip += QString( " | Requires %1 frames" ).arg( pcCurrModuleIf->m_uiNumberOfFrames );
 
     currAction->setStatusTip( moduleTooltip );
-    currAction->setData( ModuleIfInternalName );
+    currAction->setData( ModuleIfinternalName );
     currAction->setCheckable( false );
     connect( currAction, SIGNAL( triggered() ), this, SLOT( activateModule() ) );
     m_arrayModulesActions.append( currAction );
@@ -157,41 +157,41 @@ Void ModulesHandle::buildMenu()
   m_pcModulesMenu->addAction( m_arrayActions[FORCE_NEW_WINDOW_ACT] );
 }
 
-Void ModulesHandle::updateMenus()
+void ModulesHandle::updateMenus()
 {
   VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
-  Bool hasSubWindow = pcSubWindow ? true : false;
+  bool hasSubWindow = pcSubWindow ? true : false;
   QAction* currModuleAction;
 
-  for( Int i = 0; i < m_arrayModulesActions.size(); i++ )
+  for( int i = 0; i < m_arrayModulesActions.size(); i++ )
   {
     currModuleAction = m_arrayModulesActions.at( i );
     //currModuleAction->setEnabled( hasSubWindow );
     currModuleAction->setChecked( false );
   }
-  //for( Int i = 0; i < m_pcModulesSubMenuList.size(); i++ )
+  //for( int i = 0; i < m_pcModulesSubMenuList.size(); i++ )
   //{
   //	m_pcModulesSubMenuList.at( i )->setEnabled( hasSubWindow );
   //}
 
-  for( Int i = 0; i < m_arrayActions.size(); i++ )
+  for( int i = 0; i < m_arrayActions.size(); i++ )
   {
     m_arrayActions.at( i )->setEnabled( false );
   }
   m_arrayActions[LOAD_EXTERNAL_ACT]->setEnabled( true );
   m_arrayActions[FORCE_NEW_WINDOW_ACT]->setEnabled( hasSubWindow );
-  m_arrayActions[DISABLE_ALL_ACT]->setEnabled( m_pcPlaYUVerAppModuleIfList.size() > 0 );
+  m_arrayActions[DISABLE_ALL_ACT]->setEnabled( m_pcCalypAppModuleIfList.size() > 0 );
 
   if( pcSubWindow )
   {
-    QList<PlaYUVerAppModuleIf*> apcCurrentModule = pcSubWindow->getModuleArray();
+    QList<CalypAppModuleIf*> apcCurrentModule = pcSubWindow->getModuleArray();
     m_arrayActions[DISABLE_ACT]->setEnabled( apcCurrentModule.size() > 0 );
     if( pcSubWindow->getDisplayModule() )
     {
       m_arrayActions[APPLY_ALL_ACT]->setEnabled( true );
       m_arrayActions[SWAP_FRAMES_ACT]->setEnabled( true );
     }
-    for( Int i = 0; i < apcCurrentModule.size(); i++ )
+    for( int i = 0; i < apcCurrentModule.size(); i++ )
     {
       currModuleAction = apcCurrentModule.at( i )->m_pcModuleAction;
       currModuleAction->setChecked( true );
@@ -199,27 +199,27 @@ Void ModulesHandle::updateMenus()
   }
 }
 
-Void ModulesHandle::readSettings()
+void ModulesHandle::readSettings()
 {
   QSettings appSettings;
   m_arrayActions[FORCE_NEW_WINDOW_ACT]->setChecked( appSettings.value( "ModulesHandle/UseNewWindow", false ).toBool() );
 }
 
-Void ModulesHandle::writeSettings()
+void ModulesHandle::writeSettings()
 {
   QSettings appSettings;
   appSettings.setValue( "ModulesHandle/UseNewWindow", m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() );
 }
 
-Void ModulesHandle::processOpt( Int index )
+void ModulesHandle::processOpt( int index )
 {
   VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcSubWindow )
   {
-    PlaYUVerAppModuleIf* pcCurrentModule = pcSubWindow->getDisplayModule();
+    CalypAppModuleIf* pcCurrentModule = pcSubWindow->getDisplayModule();
     if( pcCurrentModule )
     {
-      PlaYUVerAppModuleIf* pcCurrModule = pcCurrentModule;
+      CalypAppModuleIf* pcCurrModule = pcCurrentModule;
       switch( index )
       {
       case INVALID_OPT:
@@ -238,9 +238,9 @@ Void ModulesHandle::processOpt( Int index )
   }
 }
 
-Void ModulesHandle::loadExternalModule()
+void ModulesHandle::loadExternalModule()
 {
-  Bool bUpdate = false;
+  bool bUpdate = false;
   QString supported = tr( "Supported Files (*.so)" );
   QStringList formatsList;
   formatsList << "Shared Libraries (*.so)";
@@ -249,19 +249,19 @@ Void ModulesHandle::loadExternalModule()
   QStringList fileNames =
       QFileDialog::getOpenFileNames( m_pcParent, tr( "Open File" ), QString(), filter.join( ";;" ) );
 
-  for( Int i = 0; i < fileNames.size(); i++ )
+  for( int i = 0; i < fileNames.size(); i++ )
   {
-    bUpdate |= PlaYUVerModuleFactory::Get()->RegisterDl( fileNames.at( i ).toStdString().data() );
+    bUpdate |= CalypModulesFactory::Get()->RegisterDl( fileNames.at( i ).toStdString().data() );
   }
   if( bUpdate )
     buildMenu();
 }
 
-Void ModulesHandle::activateModule()
+void ModulesHandle::activateModule()
 {
   QAction* pcAction = qobject_cast<QAction*>( sender() );
   Qt::KeyboardModifiers keyModifiers = QApplication::keyboardModifiers();
-  Bool bTmpForceNewWindow = false;
+  bool bTmpForceNewWindow = false;
 
   VideoSubWindow* pcVideoSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( !pcVideoSubWindow )
@@ -275,28 +275,28 @@ Void ModulesHandle::activateModule()
   }
 
   QString ModuleIfName = pcAction->data().toString();
-  PlaYUVerModuleIf* pcCurrModuleIf =
-      PlaYUVerModuleFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
-  PlaYUVerAppModuleIf* pcCurrAppModuleIf = new PlaYUVerAppModuleIf( this, pcAction, pcCurrModuleIf );
+  CalypModuleIf* pcCurrModuleIf =
+      CalypModulesFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() );
+  CalypAppModuleIf* pcCurrAppModuleIf = new CalypAppModuleIf( this, pcAction, pcCurrModuleIf );
 
   QList<VideoSubWindow*> videoSubWindowList;
-  Int numberOfFrames = pcCurrAppModuleIf->m_pcModule->m_uiNumberOfFrames;
-  if( numberOfFrames > MODULE_REQUIRES_ONE_FRAME )  // Show dialog to select sub windows
+  int numberOfFrames = pcCurrAppModuleIf->m_pcModule->m_uiNumberOfFrames;
+  if( numberOfFrames > 1 )  // Show dialog to select sub windows
   {
-    Int minNumFrames = numberOfFrames;
-    Int maxNumFrames = numberOfFrames;
-    if( numberOfFrames == MODULE_REQUIRES_SEVERAL_FRAMES )
+    int minNumFrames = numberOfFrames;
+    int maxNumFrames = numberOfFrames;
+    if( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & CLP_MODULES_VARIABLE_NUM_FRAMES )
     {
-      minNumFrames = 0;
+      minNumFrames = numberOfFrames;
       maxNumFrames = 255;
     }
-    DialogSubWindowSelector dialogWindowsSelection( m_pcParent, m_pcMainWindowManager,
+    SubWindowSelectorDialog dialogWindowsSelection( m_pcParent, m_pcMainWindowManager,
                                                     SubWindowAbstract::VIDEO_SUBWINDOW, minNumFrames, maxNumFrames );
     QList<SubWindowAbstract*> windowsList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );
 
     if( windowsList.size() == minNumFrames && windowsList.size() == maxNumFrames )
     {
-      for( Int i = 0; i < windowsList.size(); i++ )
+      for( int i = 0; i < windowsList.size(); i++ )
       {
         videoSubWindowList.append( qobject_cast<VideoSubWindow*>( windowsList.at( i ) ) );
       }
@@ -305,7 +305,7 @@ Void ModulesHandle::activateModule()
     {
       if( windowsList.size() <= minNumFrames )
       {
-        for( Int i = 0; i < windowsList.size(); i++ )
+        for( int i = 0; i < windowsList.size(); i++ )
         {
           dialogWindowsSelection.selectSubWindow( windowsList.at( i ) );
         }
@@ -318,22 +318,22 @@ Void ModulesHandle::activateModule()
       {
         VideoSubWindow* videoSubWindow;
         QList<SubWindowAbstract*> subWindowList = dialogWindowsSelection.getSelectedWindows();
-        for( Int i = 0; i < subWindowList.size(); i++ )
+        for( int i = 0; i < subWindowList.size(); i++ )
         {
           videoSubWindow = qobject_cast<VideoSubWindow*>( subWindowList.at( i ) );
           videoSubWindowList.append( videoSubWindow );
         }
       }
     }
-    if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == MODULE_API_1 )
+    if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == CLP_MODULE_API_1 )
     {
       // Check for same fmt in more than one frame modules
-      for( Int i = 1; i < videoSubWindowList.size(); i++ )
+      for( int i = 1; i < videoSubWindowList.size(); i++ )
       {
         if( !videoSubWindowList.at( i )->getCurrFrame()->haveSameFmt( videoSubWindowList.at( 0 )->getCurrFrame() ) )
         {
           videoSubWindowList.clear();
-          qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Error! Incompatible frames", LOG_ERROR );
+          qobject_cast<MainWindow*>( m_pcParent )->printMessage( "Error! Incompatible frames", CLP_LOG_ERROR );
           destroyModuleIf( pcCurrAppModuleIf );
           return;
         }
@@ -347,36 +347,36 @@ Void ModulesHandle::activateModule()
 
   if( videoSubWindowList.size() == 0 )
   {
-    qobject_cast<PlaYUVerApp*>( m_pcParent )
-        ->printMessage( "Error! There is no windows to apply the module", LOG_ERROR );
+    qobject_cast<MainWindow*>( m_pcParent )
+        ->printMessage( "Error! There is no windows to apply the module", CLP_LOG_ERROR );
     destroyModuleIf( pcCurrAppModuleIf );
     return;
   }
 
-  for( Int i = 0; i < videoSubWindowList.size(); i++ )
+  for( int i = 0; i < videoSubWindowList.size(); i++ )
   {
     pcCurrAppModuleIf->m_pcSubWindow[i] = videoSubWindowList.at( i );
   }
 
-  if( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_OPTIONS )
+  if( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & CLP_MODULE_REQUIRES_OPTIONS )
   {
     ModulesHandleOptDialog moduleOptDialog( m_pcParent, pcCurrAppModuleIf );
     if( moduleOptDialog.runConfiguration() == QDialog::Rejected )
     {
-      qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Module canceled by user!", LOG_WARNINGS );
+      qobject_cast<MainWindow*>( m_pcParent )->printMessage( "Module canceled by user!", CLP_LOG_WARNINGS );
       destroyModuleIf( pcCurrAppModuleIf );
       return;
     }
   }
 
-  Bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() | bTmpForceNewWindow;
+  bool bShowModulesNewWindow = m_arrayActions[FORCE_NEW_WINDOW_ACT]->isChecked() | bTmpForceNewWindow;
 
   QString windowName;
 
   VideoSubWindow* pcModuleSubWindow = NULL;
-  if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_PROCESSING_MODULE )
+  if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
   {
-    if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
+    if( ( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements & CLP_MODULE_REQUIRES_NEW_WINDOW ) || bShowModulesNewWindow )
     {
       pcModuleSubWindow = new VideoSubWindow( VideoSubWindow::MODULE_SUBWINDOW );
       windowName.append( QStringLiteral( "Module " ) );
@@ -390,7 +390,7 @@ Void ModulesHandle::activateModule()
       //               SLOT( moveAllScrollBars( const QPoint ) ) );
     }
   }
-  else if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == FRAME_MEASUREMENT_MODULE )
+  else if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
   {
     pcCurrAppModuleIf->m_pcDisplaySubWindow = NULL;
     pcCurrAppModuleIf->m_pcModuleDock = new ModuleHandleDock( m_pcParent, pcCurrAppModuleIf );
@@ -414,24 +414,24 @@ Void ModulesHandle::activateModule()
   {
     if( pcCurrAppModuleIf->m_pcDisplaySubWindow )
       pcCurrAppModuleIf->m_pcDisplaySubWindow->enableModule( pcCurrAppModuleIf );
-    for( Int i = 0; i < videoSubWindowList.size(); i++ )
+    for( int i = 0; i < videoSubWindowList.size(); i++ )
     {
       pcCurrAppModuleIf->m_pcSubWindow[i]->associateModule( pcCurrAppModuleIf );
     }
   }
 
   // Create Module
-  Bool moduleCreated = false;
-  if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == MODULE_API_2 )
+  bool moduleCreated = false;
+  if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == CLP_MODULE_API_2 )
   {
-    std::vector<PlaYUVerFrame*> apcFrameList;
-    for( Int i = 0; i < videoSubWindowList.size(); i++ )
+    std::vector<CalypFrame*> apcFrameList;
+    for( int i = 0; i < videoSubWindowList.size(); i++ )
     {
       apcFrameList.push_back( pcCurrAppModuleIf->m_pcSubWindow[i]->getCurrFrame() );
     }
     moduleCreated = pcCurrAppModuleIf->m_pcModule->create( apcFrameList );
   }
-  else if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == MODULE_API_1 )
+  else if( pcCurrAppModuleIf->m_pcModule->m_iModuleAPI == CLP_MODULE_API_1 )
   {
     pcCurrAppModuleIf->m_pcModule->create( pcCurrAppModuleIf->m_pcSubWindow[0]->getCurrFrame() );
     moduleCreated = true;
@@ -439,7 +439,7 @@ Void ModulesHandle::activateModule()
 
   if( !moduleCreated )
   {
-    qobject_cast<PlaYUVerApp*>( m_pcParent )->printMessage( "Error! Module cannot be created", LOG_ERROR );
+    qobject_cast<MainWindow*>( m_pcParent )->printMessage( "Error! Module cannot be created", CLP_LOG_ERROR );
     destroyModuleIf( pcCurrAppModuleIf );
     return;
   }
@@ -462,12 +462,12 @@ Void ModulesHandle::activateModule()
     videoSubWindowList.at( 0 )->setWindowName( windowName );
   }
 
-  m_pcPlaYUVerAppModuleIfList.append( pcCurrAppModuleIf );
+  m_pcCalypAppModuleIfList.append( pcCurrAppModuleIf );
 
   emit changed();
 }
 
-Void ModulesHandle::destroyModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
+void ModulesHandle::destroyModuleIf( CalypAppModuleIf* pcCurrModuleIf )
 {
   if( pcCurrModuleIf )
   {
@@ -475,7 +475,7 @@ Void ModulesHandle::destroyModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
   }
 }
 
-Void ModulesHandle::destroyWindowModules()
+void ModulesHandle::destroyWindowModules()
 {
   VideoSubWindow* pcVideoSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   if( pcVideoSubWindow )
@@ -485,44 +485,44 @@ Void ModulesHandle::destroyWindowModules()
   }
 }
 
-Void ModulesHandle::destroyAllModulesIf()
+void ModulesHandle::destroyAllModulesIf()
 {
-  for( Int i = 0; i < m_pcPlaYUVerAppModuleIfList.size(); i++ )
+  for( int i = 0; i < m_pcCalypAppModuleIfList.size(); i++ )
   {
-    destroyModuleIf( m_pcPlaYUVerAppModuleIfList.at( i ) );
+    destroyModuleIf( m_pcCalypAppModuleIfList.at( i ) );
   }
   emit changed();
 }
 
-Void ModulesHandle::applyModuleIf( QList<PlaYUVerAppModuleIf*> pcCurrModuleIfList, Bool isPlaying, Bool disableThreads )
+void ModulesHandle::applyModuleIf( QList<CalypAppModuleIf*> pcCurrModuleIfList, bool isPlaying, bool disableThreads )
 {
-  for( Int i = 0; i < pcCurrModuleIfList.size() && !isPlaying; i++ )
+  for( int i = 0; i < pcCurrModuleIfList.size() && !isPlaying; i++ )
   {
     pcCurrModuleIfList.at( i )->apply( isPlaying, disableThreads );
   }
 }
 
-Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
+void ModulesHandle::applyAllModuleIf( CalypAppModuleIf* pcCurrModuleIf )
 {
   if( pcCurrModuleIf )
   {
     if( !pcCurrModuleIf->m_pcModuleStream )
     {
-      UInt Width = 0, Height = 0, FrameRate = 30;
-      Int BitsPixel, InputFormat = -1;
+      unsigned int Width = 0, Height = 0, FrameRate = 30;
+      int BitsPixel, InputFormat = -1;
 
       QString supported = tr( "Supported Files (" );
       QStringList formatsList;
-      std::vector<PlaYUVerSupportedFormat> supportedFmts = PlaYUVerStream::supportedWriteFormats();
+      std::vector<CalypStreamFormat> supportedFmts = CalypStream::supportedWriteFormats();
 
-      for( UInt i = 0; i < supportedFmts.size(); i++ )
+      for( unsigned int i = 0; i < supportedFmts.size(); i++ )
       {
-        std::vector<String> arrayExt = supportedFmts[i].getExts();
+        std::vector<ClpString> arrayExt = supportedFmts[i].getExts();
         if( arrayExt.size() > 0 )
         {
           QString currFmt( QString::fromStdString( supportedFmts[i].formatName ) );
           currFmt.append( " (" );
-          for( std::vector<String>::iterator e = arrayExt.begin(); e != arrayExt.end(); ++e )
+          for( std::vector<ClpString>::iterator e = arrayExt.begin(); e != arrayExt.end(); ++e )
           {
             supported.append( " *." );
             currFmt.append( "*." );
@@ -549,9 +549,9 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
       BitsPixel = pcCurrModuleIf->m_pcProcessedFrame->getBitsPel();
       FrameRate = pcCurrModuleIf->m_pcSubWindow[0]->getInputStream()->getFrameRate();
 
-      pcCurrModuleIf->m_pcModuleStream = new PlaYUVerStream;
+      pcCurrModuleIf->m_pcModuleStream = new CalypStream;
       if( !pcCurrModuleIf->m_pcModuleStream->open( fileName.toStdString(), Width, Height, InputFormat, BitsPixel,
-                                                   PLAYUVER_LITTLE_ENDIAN, FrameRate, false ) )
+                                                   CLP_LITTLE_ENDIAN, FrameRate, false ) )
       {
         delete pcCurrModuleIf->m_pcModuleStream;
         pcCurrModuleIf->m_pcModuleStream = NULL;
@@ -561,10 +561,10 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
   }
   if( pcCurrModuleIf->m_pcModuleStream )
   {
-    UInt numberOfWindows = pcCurrModuleIf->m_pcModule->m_uiNumberOfFrames;
-    UInt64 currFrames = 0;
-    UInt64 numberOfFrames = INT_MAX;
-    for( UInt i = 0; i < numberOfWindows; i++ )
+    unsigned int numberOfWindows = pcCurrModuleIf->m_pcModule->m_uiNumberOfFrames;
+    unsigned long long int currFrames = 0;
+    unsigned long long int numberOfFrames = INT_MAX;
+    for( unsigned int i = 0; i < numberOfWindows; i++ )
     {
       currFrames = pcCurrModuleIf->m_pcSubWindow[i]->getInputStream()->getFrameNum();
       if( currFrames < numberOfFrames )
@@ -572,18 +572,18 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
       pcCurrModuleIf->m_pcSubWindow[i]->stop();
     }
     QApplication::setOverrideCursor( Qt::WaitCursor );
-    for( UInt f = 1; f < numberOfFrames; f++ )
+    for( unsigned int f = 1; f < numberOfFrames; f++ )
     {
       pcCurrModuleIf->apply( false, true );
       QCoreApplication::processEvents();
       pcCurrModuleIf->m_pcModuleStream->writeFrame( pcCurrModuleIf->m_pcProcessedFrame );
-      for( UInt i = 0; i < numberOfWindows; i++ )
+      for( unsigned int i = 0; i < numberOfWindows; i++ )
       {
         pcCurrModuleIf->m_pcSubWindow[i]->play();
         pcCurrModuleIf->m_pcSubWindow[i]->playEvent();
       }
     }
-    for( UInt i = 0; i < numberOfWindows; i++ )
+    for( unsigned int i = 0; i < numberOfWindows; i++ )
     {
       pcCurrModuleIf->m_pcSubWindow[i]->stop();
     }
@@ -591,9 +591,9 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
   }
 }
 
-Void ModulesHandle::swapModulesWindowsIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
+void ModulesHandle::swapModulesWindowsIf( CalypAppModuleIf* pcCurrModuleIf )
 {
-  if( pcCurrModuleIf->m_pcModule->m_uiNumberOfFrames == MODULE_REQUIRES_TWO_FRAMES )
+  if( pcCurrModuleIf->m_pcModule->m_uiNumberOfFrames == 2 )
   {
     VideoSubWindow* auxWindowHandle = pcCurrModuleIf->m_pcSubWindow[0];
     pcCurrModuleIf->m_pcSubWindow[0] = pcCurrModuleIf->m_pcSubWindow[1];
@@ -602,13 +602,13 @@ Void ModulesHandle::swapModulesWindowsIf( PlaYUVerAppModuleIf* pcCurrModuleIf )
   }
 }
 
-Void ModulesHandle::customEvent( QEvent* event )
+void ModulesHandle::customEvent( QEvent* event )
 {
   if( !event )
   {
     return;
   }
-  PlaYUVerAppModuleIf::EventData* eventData = (PlaYUVerAppModuleIf::EventData*)event;
+  CalypAppModuleIf::EventData* eventData = (CalypAppModuleIf::EventData*)event;
   if( eventData->m_bSuccess )
   {
     eventData->m_pcModule->show();