1 files changed, 20 insertions, 17 deletions

diff --git a/xbmc/addons/interfaces/gui/controls/Progress.cpp b/xbmc/addons/interfaces/gui/controls/Progress.cpp
index 17885c8ed1..639d079d4e 100644
--- a/xbmc/addons/interfaces/gui/controls/Progress.cpp
+++ b/xbmc/addons/interfaces/gui/controls/Progress.cpp
@@ -14,14 +14,13 @@
 #include "guilib/GUIWindowManager.h"
 #include "utils/log.h"
 
-extern "C"
-{
 namespace ADDON
 {
 
 void Interface_GUIControlProgress::Init(AddonGlobalInterface* addonInterface)
 {
-  addonInterface->toKodi->kodi_gui->control_progress = static_cast<AddonToKodiFuncTable_kodi_gui_control_progress*>(malloc(sizeof(AddonToKodiFuncTable_kodi_gui_control_progress)));
+  addonInterface->toKodi->kodi_gui->control_progress =
+      new AddonToKodiFuncTable_kodi_gui_control_progress();
 
   addonInterface->toKodi->kodi_gui->control_progress->set_visible = set_visible;
   addonInterface->toKodi->kodi_gui->control_progress->set_percentage = set_percentage;
@@ -30,51 +29,56 @@ void Interface_GUIControlProgress::Init(AddonGlobalInterface* addonInterface)
 
 void Interface_GUIControlProgress::DeInit(AddonGlobalInterface* addonInterface)
 {
-  free(addonInterface->toKodi->kodi_gui->control_progress);
+  delete addonInterface->toKodi->kodi_gui->control_progress;
 }
 
-void Interface_GUIControlProgress::set_visible(void* kodiBase, void* handle, bool visible)
+void Interface_GUIControlProgress::set_visible(KODI_HANDLE kodiBase,
+                                               KODI_GUI_CONTROL_HANDLE handle,
+                                               bool visible)
 {
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
   if (!addon || !control)
   {
     CLog::Log(LOGERROR,
-              "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
-              "handle='%p') on addon '%s'",
-              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
+              "Interface_GUIControlProgress::{} - invalid handler data (kodiBase='{}', "
+              "handle='{}') on addon '{}'",
+              __func__, kodiBase, handle, addon ? addon->ID() : "unknown");
     return;
   }
 
   control->SetVisible(visible);
 }
 
-void Interface_GUIControlProgress::set_percentage(void* kodiBase, void* handle, float percent)
+void Interface_GUIControlProgress::set_percentage(KODI_HANDLE kodiBase,
+                                                  KODI_GUI_CONTROL_HANDLE handle,
+                                                  float percent)
 {
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
   if (!addon || !control)
   {
     CLog::Log(LOGERROR,
-              "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
-              "handle='%p') on addon '%s'",
-              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
+              "Interface_GUIControlProgress::{} - invalid handler data (kodiBase='{}', "
+              "handle='{}') on addon '{}'",
+              __func__, kodiBase, handle, addon ? addon->ID() : "unknown");
     return;
   }
 
   control->SetPercentage(percent);
 }
 
-float Interface_GUIControlProgress::get_percentage(void* kodiBase, void* handle)
+float Interface_GUIControlProgress::get_percentage(KODI_HANDLE kodiBase,
+                                                   KODI_GUI_CONTROL_HANDLE handle)
 {
   CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
   CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
   if (!addon || !control)
   {
     CLog::Log(LOGERROR,
-              "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
-              "handle='%p') on addon '%s'",
-              __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
+              "Interface_GUIControlProgress::{} - invalid handler data (kodiBase='{}', "
+              "handle='{}') on addon '{}'",
+              __func__, kodiBase, handle, addon ? addon->ID() : "unknown");
     return 0.0f;
   }
 
@@ -82,4 +86,3 @@ float Interface_GUIControlProgress::get_percentage(void* kodiBase, void* handle)
 }
 
 } /* namespace ADDON */
-} /* extern "C" */